lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2500 from mark-monteiro/2498-register-logging-correctly

Browse Source 
Register Logging Services Correctly
This commit is contained in:
Bond-009 2020-03-03 21:53:53 +01:00 committed by GitHub
commit 5276c75cde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Emby.Server.Implementations/ApplicationHost.cs
View File

@ -672,9 +672,8 @@ namespace Emby.Server.Implementations
serviceCollection.AddSingleton(JsonSerializer); serviceCollection.AddSingleton(JsonSerializer);
serviceCollection.AddSingleton(LoggerFactory); // TODO: Support for injecting ILogger should be deprecated in favour of ILogger<T> and this removed
serviceCollection.AddLogging(); serviceCollection.AddSingleton<ILogger>(Logger);
serviceCollection.AddSingleton(Logger);
serviceCollection.AddSingleton(FileSystemManager); serviceCollection.AddSingleton(FileSystemManager);
serviceCollection.AddSingleton<TvDbClientManager>(); serviceCollection.AddSingleton<TvDbClientManager>();

2
Jellyfin.Server/Program.cs
View File

@ -26,6 +26,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Abstractions;
using Serilog; using Serilog;
using Serilog.Events;
using Serilog.Extensions.Logging; using Serilog.Extensions.Logging;
using SQLitePCL; using SQLitePCL;
using ILogger = Microsoft.Extensions.Logging.ILogger; using ILogger = Microsoft.Extensions.Logging.ILogger;
@ -260,6 +261,7 @@ namespace Jellyfin.Server
} }
} }
}) })
.UseSerilog()
.UseContentRoot(appHost.ContentRoot) .UseContentRoot(appHost.ContentRoot)
.ConfigureServices(services => .ConfigureServices(services =>
{ {

8
Jellyfin.Server/Resources/Configuration/logging.json
View File

@ -1,6 +1,12 @@
{ {
"Serilog": { "Serilog": {
"MinimumLevel": "Information", "MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft": "Warning",
"System": "Warning"
}
},
"WriteTo": [ "WriteTo": [
{ {
"Name": "Console", "Name": "Console",