diff options
| author | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-03-03 22:27:49 +0100 |
|---|---|---|
| committer | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-03-03 22:27:49 +0100 |
| commit | 76957213e601e8f03c9975707d5e0a22b899207b (patch) | |
| tree | 4b4e165ee2c83702fea98c8f9e5fc767caafea51 /Jellyfin.Server | |
| parent | 7e3b6768f81c1cef6889bd7c500ba563aa13a67c (diff) | |
| parent | 5276c75cdeb079cd0b24c4b2dc574a584d5817b6 (diff) | |
Merge remote-tracking branch 'upstream/master' into support-injecting-iconfiguration
Diffstat (limited to 'Jellyfin.Server')
| -rw-r--r-- | Jellyfin.Server/Program.cs | 2 | ||||
| -rw-r--r-- | Jellyfin.Server/Resources/Configuration/logging.json | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs index 7ac3b0efb4..24e4ee520e 100644 --- a/Jellyfin.Server/Program.cs +++ b/Jellyfin.Server/Program.cs @@ -26,6 +26,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Serilog; +using Serilog.Events; using Serilog.Extensions.Logging; using SQLitePCL; using ILogger = Microsoft.Extensions.Logging.ILogger; @@ -262,6 +263,7 @@ namespace Jellyfin.Server } }) .ConfigureAppConfiguration(config => config.ConfigureAppConfiguration(appPaths)) + .UseSerilog() .UseContentRoot(appHost.ContentRoot) .ConfigureServices(services => { diff --git a/Jellyfin.Server/Resources/Configuration/logging.json b/Jellyfin.Server/Resources/Configuration/logging.json index acbca8b856..f64a85219d 100644 --- a/Jellyfin.Server/Resources/Configuration/logging.json +++ b/Jellyfin.Server/Resources/Configuration/logging.json @@ -1,6 +1,12 @@ { "Serilog": { - "MinimumLevel": "Information", + "MinimumLevel": { + "Default": "Information", + "Override": { + "Microsoft": "Warning", + "System": "Warning" + } + }, "WriteTo": [ { "Name": "Console", |