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

Do not save a reference to the startup config in ApplicationHost

Browse Source
This commit is contained in:
Mark Monteiro
2020-02-28 23:28:15 +01:00
parent a4e5a5ab31
commit 48f8118072
4 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Jellyfin.Server/Program.cs
View File

@@ -103,10 +103,10 @@ namespace Jellyfin.Server
// Create an instance of the application configuration to use for application startup
await InitLoggingConfigFile(appPaths).ConfigureAwait(false);
IConfiguration appConfig = CreateAppConfiguration(appPaths);
IConfiguration startupConfig = CreateAppConfiguration(appPaths);
// Initialize logging framework
InitializeLoggingFramework(appConfig, appPaths);
InitializeLoggingFramework(startupConfig, appPaths);
_logger = _loggerFactory.CreateLogger("Main");
// Log uncaught exceptions to the logging instead of std error
@@ -171,12 +171,11 @@ namespace Jellyfin.Server
options,
new ManagedFileSystem(_loggerFactory.CreateLogger<ManagedFileSystem>(), appPaths),
GetImageEncoder(appPaths),
new NetworkManager(_loggerFactory.CreateLogger<NetworkManager>()),
appConfig);
new NetworkManager(_loggerFactory.CreateLogger<NetworkManager>()));
try
{
ServiceCollection serviceCollection = new ServiceCollection();
await appHost.InitAsync(serviceCollection).ConfigureAwait(false);
await appHost.InitAsync(serviceCollection, startupConfig).ConfigureAwait(false);
var webHost = CreateWebHostBuilder(appHost, serviceCollection, appPaths).Build();