aboutsummaryrefslogtreecommitdiff
path: root/Jellyfin.Server
diff options
context:
space:
mode:
authorMark Monteiro <marknr.monteiro@protonmail.com>2020-03-06 19:28:36 +0100
committerMark Monteiro <marknr.monteiro@protonmail.com>2020-03-06 19:28:36 +0100
commit6660006f01aee44ea33d1539000c5e4ea06e1115 (patch)
tree677b42cd170a91b1ad14ed21053cbee1b222a9c6 /Jellyfin.Server
parent1a9908d094a83b66c1b56e78bc496a1ff056c7d9 (diff)
Load user logging config file into application configuration
Diffstat (limited to 'Jellyfin.Server')
-rw-r--r--Jellyfin.Server/Program.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs
index 970443c8b..2590fdb21 100644
--- a/Jellyfin.Server/Program.cs
+++ b/Jellyfin.Server/Program.cs
@@ -470,7 +470,8 @@ namespace Jellyfin.Server
return new ConfigurationBuilder()
.SetBasePath(appPaths.ConfigurationDirectoryPath)
.AddInMemoryCollection(ConfigurationOptions.Configuration)
- .AddJsonFile(LoggingConfigFileDefault, false, true)
+ .AddJsonFile(LoggingConfigFileDefault, optional: false, reloadOnChange: true)
+ .AddJsonFile(LoggingConfigFileUser, optional: true, reloadOnChange: true)
.AddEnvironmentVariables("JELLYFIN_")
.Build();
}