github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 05:57:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

Create separate constants for the two logging file names

Browse source
This commit is contained in:
Mark Monteiro 2020-03-06 19:07:34 +01:00
parent 098d3538e3
commit f2fdf50b3b
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Jellyfin.Server/Program.cs
View file

@ -39,9 +39,14 @@ namespace Jellyfin.Server
public static class Program
{
/// <summary>
/// The name of logging configuration file.
/// The name of logging configuration file containing application defaults.
/// </summary>
public static readonly string LoggingConfigFile = "logging.json";
public static readonly string LoggingConfigFileDefault = "logging.default.json";
/// <summary>
/// The name of the logging configuration file containing user override settings.
/// </summary>
public static readonly string LoggingConfigFileUser = "logging.user.json";
private static readonly CancellationTokenSource _tokenSource = new CancellationTokenSource();
private static readonly ILoggerFactory _loggerFactory = new SerilogLoggerFactory();
@ -443,7 +448,7 @@ namespace Jellyfin.Server
private static async Task<IConfiguration> CreateConfiguration(IApplicationPaths appPaths)
{
const string ResourcePath = "Jellyfin.Server.Resources.Configuration.logging.json";
string configPath = Path.Combine(appPaths.ConfigurationDirectoryPath, LoggingConfigFile);
string configPath = Path.Combine(appPaths.ConfigurationDirectoryPath, LoggingConfigFileDefault);
if (!File.Exists(configPath))
{
@ -465,7 +470,7 @@ namespace Jellyfin.Server
return new ConfigurationBuilder()
.SetBasePath(appPaths.ConfigurationDirectoryPath)
.AddInMemoryCollection(ConfigurationOptions.Configuration)
.AddJsonFile(LoggingConfigFile, false, true)
.AddJsonFile(LoggingConfigFileDefault, false, true)
.AddEnvironmentVariables("JELLYFIN_")
.Build();
}