aboutsummaryrefslogtreecommitdiff
path: root/Jellyfin.Server/Program.cs
diff options
context:
space:
mode:
authorMark Monteiro <marknr.monteiro@protonmail.com>2020-03-08 15:46:13 +0100
committerMark Monteiro <marknr.monteiro@protonmail.com>2020-03-08 15:46:13 +0100
commit8dbb1c92573ba5cf3e4f8d953ffd6083a8ccbde4 (patch)
treecbcaa602a9f95b296f26c4026bbf611701018863 /Jellyfin.Server/Program.cs
parent2f0b4cc24c84d98820c8a6755191d4fc1dab74e7 (diff)
Use logging.json instead of logging.user.json for override settings
Diffstat (limited to 'Jellyfin.Server/Program.cs')
-rw-r--r--Jellyfin.Server/Program.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs
index 2590fdb21..7c3d0f277 100644
--- a/Jellyfin.Server/Program.cs
+++ b/Jellyfin.Server/Program.cs
@@ -44,9 +44,9 @@ namespace Jellyfin.Server
public static readonly string LoggingConfigFileDefault = "logging.default.json";
/// <summary>
- /// The name of the logging configuration file containing user override settings.
+ /// The name of the logging configuration file containing the system-specific override settings.
/// </summary>
- public static readonly string LoggingConfigFileUser = "logging.user.json";
+ public static readonly string LoggingConfigFileSystem = "logging.json";
private static readonly CancellationTokenSource _tokenSource = new CancellationTokenSource();
private static readonly ILoggerFactory _loggerFactory = new SerilogLoggerFactory();
@@ -471,7 +471,7 @@ namespace Jellyfin.Server
.SetBasePath(appPaths.ConfigurationDirectoryPath)
.AddInMemoryCollection(ConfigurationOptions.Configuration)
.AddJsonFile(LoggingConfigFileDefault, optional: false, reloadOnChange: true)
- .AddJsonFile(LoggingConfigFileUser, optional: true, reloadOnChange: true)
+ .AddJsonFile(LoggingConfigFileSystem, optional: true, reloadOnChange: true)
.AddEnvironmentVariables("JELLYFIN_")
.Build();
}