瀏覽代碼

Inject logger correctly into ActivityManager and ActivityRepository

Mark Monteiro 5 年之前
父節點
當前提交
7b31b0e322

+ 2 - 2
Emby.Server.Implementations/Activity/ActivityManager.cs

@@ -18,11 +18,11 @@ namespace Emby.Server.Implementations.Activity
         private readonly IUserManager _userManager;
 
         public ActivityManager(
-            ILoggerFactory loggerFactory,
+            ILogger<ActivityManager> logger,
             IActivityRepository repo,
             IUserManager userManager)
         {
-            _logger = loggerFactory.CreateLogger(nameof(ActivityManager));
+            _logger = logger;
             _repo = repo;
             _userManager = userManager;
         }

+ 2 - 2
Emby.Server.Implementations/Activity/ActivityRepository.cs

@@ -20,8 +20,8 @@ namespace Emby.Server.Implementations.Activity
         private static readonly CultureInfo _usCulture = CultureInfo.ReadOnly(new CultureInfo("en-US"));
         private readonly IFileSystem _fileSystem;
 
-        public ActivityRepository(ILoggerFactory loggerFactory, IServerApplicationPaths appPaths, IFileSystem fileSystem)
-            : base(loggerFactory.CreateLogger(nameof(ActivityRepository)))
+        public ActivityRepository(ILogger<ActivityRepository> logger, IServerApplicationPaths appPaths, IFileSystem fileSystem)
+            : base(logger)
         {
             DbFilePath = Path.Combine(appPaths.DataPath, "activitylog.db");
             _fileSystem = fileSystem;

+ 1 - 1
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -471,7 +471,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 var videoDecoder = GetHardwareAcceleratedVideoDecoder(state, encodingOptions);
                 var outputVideoCodec = GetVideoEncoder(state, encodingOptions);
-				
+                
                 var hasTextSubs = state.SubtitleStream != null && state.SubtitleStream.IsTextSubtitleStream && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
 
                 if (!hasTextSubs)