starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 05:53:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6096 from cvium/saving_private_ram

Browse Source
This commit is contained in:
Bond-009
2021-06-12 00:20:54 +02:00
committed by GitHub
parent adf406b182 66de842896
commit cfad97ff28
44 changed files with 1146 additions and 910 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
View File

@@ -299,25 +299,29 @@ namespace Emby.Server.Implementations.AppBase
/// <inheritdoc />
public object GetConfiguration(string key)
{
return _configurations.GetOrAdd(key, k =>
{
var file = GetConfigurationFile(key);
var configurationInfo = _configurationStores
.FirstOrDefault(i => string.Equals(i.Key, key, StringComparison.OrdinalIgnoreCase));
if (configurationInfo == null)
return _configurations.GetOrAdd(
key,
(k, configurationManager) =>
{
throw new ResourceNotFoundException("Configuration with key " + key + " not found.");
}
var file = configurationManager.GetConfigurationFile(k);
var configurationType = configurationInfo.ConfigurationType;
var configurationInfo = Array.Find(
configurationManager._configurationStores,
i => string.Equals(i.Key, k, StringComparison.OrdinalIgnoreCase));
lock (_configurationSyncLock)
{
return LoadConfiguration(file, configurationType);
}
});
if (configurationInfo == null)
{
throw new ResourceNotFoundException("Configuration with key " + k + " not found.");
}
var configurationType = configurationInfo.ConfigurationType;
lock (configurationManager._configurationSyncLock)
{
return configurationManager.LoadConfiguration(file, configurationType);
}
},
this);
}
private object LoadConfiguration(string path, Type configurationType)