Use Microsoft.Extensions.Logging abstraction

4 files changed, 47 insertions, 47 deletions

diff --git a/MediaBrowser.Providers/Manager/ImageSaver.cs b/MediaBrowser.Providers/Manager/ImageSaver.cs
index f50dcf1c50..c1cb07a0e7 100644
--- a/MediaBrowser.Providers/Manager/ImageSaver.cs
+++ b/MediaBrowser.Providers/Manager/ImageSaver.cs
@@ -7,7 +7,7 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Net;
 using System;
 using System.Collections.Generic;
@@ -164,7 +164,7 @@ namespace MediaBrowser.Providers.Manager
             {
                 var currentPath = currentImagePath;
 
-                _logger.Info("Deleting previous image {0}", currentPath);
+                _logger.LogInformation("Deleting previous image {0}", currentPath);
 
                 _libraryMonitor.ReportFileSystemChangeBeginning(currentPath);
 
@@ -197,7 +197,7 @@ namespace MediaBrowser.Providers.Manager
 
                 if (retry)
                 {
-                    _logger.Error("UnauthorizedAccessException - Access to path {0} is denied. Will retry saving to {1}", path, retryPath);
+                    _logger.LogError("UnauthorizedAccessException - Access to path {0} is denied. Will retry saving to {1}", path, retryPath);
                 }
                 else
                 {
@@ -211,7 +211,7 @@ namespace MediaBrowser.Providers.Manager
 
                 if (retry)
                 {
-                    _logger.Error("IOException saving to {0}. {2}. Will retry saving to {1}", path, retryPath, ex.Message);
+                    _logger.LogError("IOException saving to {0}. {2}. Will retry saving to {1}", path, retryPath, ex.Message);
                 }
                 else
                 {
@@ -233,7 +233,7 @@ namespace MediaBrowser.Providers.Manager
         /// <returns>Task.</returns>
         private async Task SaveImageToLocation(Stream source, string path, CancellationToken cancellationToken)
         {
-            _logger.Debug("Saving image to {0}", path);
+            _logger.LogDebug("Saving image to {0}", path);
 
             var parentFolder = _fileSystem.GetDirectoryName(path);
 
@@ -271,7 +271,7 @@ namespace MediaBrowser.Providers.Manager
             }
             catch (Exception ex)
             {
-                _logger.Error("Error setting hidden attribute on {0} - {1}", path, ex.Message);
+                _logger.LogError("Error setting hidden attribute on {0} - {1}", path, ex.Message);
             }
         }
 
diff --git a/MediaBrowser.Providers/Manager/ItemImageProvider.cs b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
index c80d438411..a11ccd6d6c 100644
--- a/MediaBrowser.Providers/Manager/ItemImageProvider.cs
+++ b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
@@ -5,7 +5,7 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Providers;
 using System;
@@ -126,7 +126,7 @@ namespace MediaBrowser.Providers.Manager
 
                     if (!HasImage(item, imageType) || (refreshOptions.IsReplacingImage(imageType) && !downloadedImages.Contains(imageType)))
                     {
-                        _logger.Debug("Running {0} for {1}", provider.GetType().Name, item.Path ?? item.Name);
+                        _logger.LogDebug("Running {0} for {1}", provider.GetType().Name, item.Path ?? item.Name);
 
                         var response = await provider.GetImage(item, imageType, cancellationToken).ConfigureAwait(false);
 
@@ -136,7 +136,7 @@ namespace MediaBrowser.Providers.Manager
                             {
                                 if (response.Protocol == MediaProtocol.Http)
                                 {
-                                    _logger.Debug("Setting image url into item {0}", item.Id);
+                                    _logger.LogDebug("Setting image url into item {0}", item.Id);
                                     item.SetImage(new ItemImageInfo
                                     {
                                         Path = response.Path,
@@ -173,7 +173,7 @@ namespace MediaBrowser.Providers.Manager
             catch (Exception ex)
             {
                 result.ErrorMessage = ex.Message;
-                _logger.ErrorException("Error in {0}", ex, provider.Name);
+                _logger.LogError("Error in {0}", ex, provider.Name);
             }
         }
 
@@ -264,7 +264,7 @@ namespace MediaBrowser.Providers.Manager
                     return;
                 }
 
-                _logger.Debug("Running {0} for {1}", provider.GetType().Name, item.Path ?? item.Name);
+                _logger.LogDebug("Running {0} for {1}", provider.GetType().Name, item.Path ?? item.Name);
 
                 var images = await _providerManager.GetAvailableRemoteImages(item, new RemoteImageQuery
                 {
@@ -310,7 +310,7 @@ namespace MediaBrowser.Providers.Manager
             catch (Exception ex)
             {
                 result.ErrorMessage = ex.Message;
-                _logger.ErrorException("Error in {0}", ex, provider.Name);
+                _logger.LogError("Error in {0}", ex, provider.Name);
             }
         }
 
@@ -577,7 +577,7 @@ namespace MediaBrowser.Providers.Manager
                         }
                         catch (IOException ex)
                         {
-                            _logger.ErrorException("Error examining images", ex);
+                            _logger.LogError("Error examining images", ex);
                         }
                     }
 
@@ -596,4 +596,4 @@ namespace MediaBrowser.Providers.Manager
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index 57711d3b68..5d607f5d67 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -4,7 +4,7 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -46,7 +46,7 @@ namespace MediaBrowser.Providers.Manager
             }
             catch (Exception ex)
             {
-                Logger.ErrorException("Error getting file {0}", ex, path);
+                Logger.LogError("Error getting file {0}", ex, path);
                 return null;
             }
         }
@@ -73,7 +73,7 @@ namespace MediaBrowser.Providers.Manager
 
                 if (requiresRefresh)
                 {
-                    Logger.Debug("Refreshing {0} {1} because item.RequiresRefresh() returned true", typeof(TItemType).Name, item.Path ?? item.Name);
+                    Logger.LogDebug("Refreshing {0} {1} because item.RequiresRefresh() returned true", typeof(TItemType).Name, item.Path ?? item.Name);
                 }
             }
 
@@ -96,7 +96,7 @@ namespace MediaBrowser.Providers.Manager
                 localImagesFailed = true;
                 if (!(item is IItemByName))
                 {
-                    Logger.ErrorException("Error validating images for {0}", ex, item.Path ?? item.Name ?? "Unknown name");
+                    Logger.LogError("Error validating images for {0}", ex, item.Path ?? item.Name ?? "Unknown name");
                 }
             }
 
@@ -268,7 +268,7 @@ namespace MediaBrowser.Providers.Manager
             //    }
             //    catch (Exception ex)
             //    {
-            //        Logger.ErrorException("Error in AddPersonImage", ex);
+            //        Logger.LogError("Error in AddPersonImage", ex);
             //    }
             //}
 
@@ -728,7 +728,7 @@ namespace MediaBrowser.Providers.Manager
             foreach (var provider in providers.OfType<ILocalMetadataProvider<TItemType>>().ToList())
             {
                 var providerName = provider.GetType().Name;
-                Logger.Debug("Running {0} for {1}", providerName, logName);
+                Logger.LogDebug("Running {0} for {1}", providerName, logName);
 
                 var itemInfo = new ItemInfo(item);
 
@@ -759,7 +759,7 @@ namespace MediaBrowser.Providers.Manager
                         break;
                     }
 
-                    Logger.Debug("{0} returned no metadata for {1}", providerName, logName);
+                    Logger.LogDebug("{0} returned no metadata for {1}", providerName, logName);
                 }
                 catch (OperationCanceledException)
                 {
@@ -767,7 +767,7 @@ namespace MediaBrowser.Providers.Manager
                 }
                 catch (Exception ex)
                 {
-                    Logger.ErrorException("Error in {0}", ex, provider.Name);
+                    Logger.LogError("Error in {0}", ex, provider.Name);
 
                     // If a local provider fails, consider that a failure
                     refreshResult.ErrorMessage = ex.Message;
@@ -826,7 +826,7 @@ namespace MediaBrowser.Providers.Manager
 
         private async Task RunCustomProvider(ICustomMetadataProvider<TItemType> provider, TItemType item, string logName, MetadataRefreshOptions options, RefreshResult refreshResult, CancellationToken cancellationToken)
         {
-            Logger.Debug("Running {0} for {1}", provider.GetType().Name, logName);
+            Logger.LogDebug("Running {0} for {1}", provider.GetType().Name, logName);
 
             try
             {
@@ -839,7 +839,7 @@ namespace MediaBrowser.Providers.Manager
             catch (Exception ex)
             {
                 refreshResult.ErrorMessage = ex.Message;
-                Logger.ErrorException("Error in {0}", ex, provider.Name);
+                Logger.LogError("Error in {0}", ex, provider.Name);
             }
         }
 
@@ -857,7 +857,7 @@ namespace MediaBrowser.Providers.Manager
             foreach (var provider in providers)
             {
                 var providerName = provider.GetType().Name;
-                Logger.Debug("Running {0} for {1}", providerName, logName);
+                Logger.LogDebug("Running {0} for {1}", providerName, logName);
 
                 if (id != null && !tmpDataMerged)
                 {
@@ -880,7 +880,7 @@ namespace MediaBrowser.Providers.Manager
                     }
                     else
                     {
-                        Logger.Debug("{0} returned no metadata for {1}", providerName, logName);
+                        Logger.LogDebug("{0} returned no metadata for {1}", providerName, logName);
                     }
                 }
                 catch (OperationCanceledException)
@@ -891,7 +891,7 @@ namespace MediaBrowser.Providers.Manager
                 {
                     refreshResult.Failures++;
                     refreshResult.ErrorMessage = ex.Message;
-                    Logger.ErrorException("Error in {0}", ex, provider.Name);
+                    Logger.LogError("Error in {0}", ex, provider.Name);
                 }
             }
 
@@ -944,14 +944,14 @@ namespace MediaBrowser.Providers.Manager
 
                 //if (hasChanged)
                 //{
-                //    Logger.Debug("{0} reports change to {1}", changeMonitor.GetType().Name, item.Path ?? item.Name);
+                //    logger.LogDebug("{0} reports change to {1}", changeMonitor.GetType().Name, item.Path ?? item.Name);
                 //}
 
                 return hasChanged;
             }
             catch (Exception ex)
             {
-                Logger.ErrorException("Error in {0}.HasChanged", ex, changeMonitor.GetType().Name);
+                Logger.LogError("Error in {0}.HasChanged", ex, changeMonitor.GetType().Name);
                 return false;
             }
         }
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 8697c7c57a..d562676413 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -10,7 +10,7 @@ using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Providers;
 using System;
 using System.Collections.Generic;
@@ -79,9 +79,9 @@ namespace MediaBrowser.Providers.Manager
         /// <summary>
         /// Initializes a new instance of the <see cref="ProviderManager" /> class.
         /// </summary>
-        public ProviderManager(IHttpClient httpClient, ISubtitleManager subtitleManager, IServerConfigurationManager configurationManager, ILibraryMonitor libraryMonitor, ILogManager logManager, IFileSystem fileSystem, IServerApplicationPaths appPaths, Func<ILibraryManager> libraryManagerFactory, IJsonSerializer json)
+        public ProviderManager(IHttpClient httpClient, ISubtitleManager subtitleManager, IServerConfigurationManager configurationManager, ILibraryMonitor libraryMonitor, ILoggerFactory loggerFactory, IFileSystem fileSystem, IServerApplicationPaths appPaths, Func<ILibraryManager> libraryManagerFactory, IJsonSerializer json)
         {
-            _logger = logManager.GetLogger("ProviderManager");
+            _logger = loggerFactory.CreateLogger("ProviderManager");
             _httpClient = httpClient;
             ConfigurationManager = configurationManager;
             _libraryMonitor = libraryMonitor;
@@ -144,7 +144,7 @@ namespace MediaBrowser.Providers.Manager
                 return service.RefreshMetadata(item, options, cancellationToken);
             }
 
-            _logger.Error("Unable to find a metadata service for item of type " + item.GetType().Name);
+            _logger.LogError("Unable to find a metadata service for item of type " + item.GetType().Name);
             return Task.FromResult(ItemUpdateType.None);
         }
 
@@ -250,7 +250,7 @@ namespace MediaBrowser.Providers.Manager
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("{0} failed in GetImageInfos for type {1}", ex, provider.GetType().Name, item.GetType().Name);
+                _logger.LogError("{0} failed in GetImageInfos for type {1}", ex, provider.GetType().Name, item.GetType().Name);
                 return new List<RemoteImageInfo>();
             }
         }
@@ -396,7 +396,7 @@ namespace MediaBrowser.Providers.Manager
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("{0} failed in Supports for type {1}", ex, provider.GetType().Name, item.GetType().Name);
+                _logger.LogError("{0} failed in Supports for type {1}", ex, provider.GetType().Name, item.GetType().Name);
                 return false;
             }
         }
@@ -620,7 +620,7 @@ namespace MediaBrowser.Providers.Manager
 
             foreach (var saver in savers.Where(i => IsSaverEnabledForItem(i, item, libraryOptions, updateType, false)))
             {
-                _logger.Debug("Saving {0} to {1}.", item.Path ?? item.Name, saver.Name);
+                _logger.LogDebug("Saving {0} to {1}.", item.Path ?? item.Name, saver.Name);
 
                 var fileSaver = saver as IMetadataFileSaver;
 
@@ -634,7 +634,7 @@ namespace MediaBrowser.Providers.Manager
                     }
                     catch (Exception ex)
                     {
-                        _logger.ErrorException("Error in {0} GetSavePath", ex, saver.Name);
+                        _logger.LogError("Error in {0} GetSavePath", ex, saver.Name);
                         continue;
                     }
 
@@ -645,7 +645,7 @@ namespace MediaBrowser.Providers.Manager
                     }
                     catch (Exception ex)
                     {
-                        _logger.ErrorException("Error in metadata saver", ex);
+                        _logger.LogError("Error in metadata saver", ex);
                     }
                     finally
                     {
@@ -660,7 +660,7 @@ namespace MediaBrowser.Providers.Manager
                     }
                     catch (Exception ex)
                     {
-                        _logger.ErrorException("Error in metadata saver", ex);
+                        _logger.LogError("Error in metadata saver", ex);
                     }
                 }
             }
@@ -723,7 +723,7 @@ namespace MediaBrowser.Providers.Manager
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error in {0}.IsEnabledFor", ex, saver.Name);
+                _logger.LogError("Error in {0}.IsEnabledFor", ex, saver.Name);
                 return false;
             }
         }
@@ -825,7 +825,7 @@ namespace MediaBrowser.Providers.Manager
                 }
             }
 
-            //_logger.Debug("Returning search results {0}", _json.SerializeToString(resultList));
+            //_logger.LogDebug("Returning search results {0}", _json.SerializeToString(resultList));
 
             return resultList;
         }
@@ -868,7 +868,7 @@ namespace MediaBrowser.Providers.Manager
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error in {0}.Suports", ex, i.GetType().Name);
+                    _logger.LogError("Error in {0}.Suports", ex, i.GetType().Name);
                     return false;
                 }
             });
@@ -930,7 +930,7 @@ namespace MediaBrowser.Providers.Manager
 
         public void OnRefreshStart(BaseItem item)
         {
-            //_logger.Info("OnRefreshStart {0}", item.Id.ToString("N"));
+            //_logger.LogInformation("OnRefreshStart {0}", item.Id.ToString("N"));
             var id = item.Id;
 
             lock (_activeRefreshes)
@@ -946,7 +946,7 @@ namespace MediaBrowser.Providers.Manager
 
         public void OnRefreshComplete(BaseItem item)
         {
-            //_logger.Info("OnRefreshComplete {0}", item.Id.ToString("N"));
+            //_logger.LogInformation("OnRefreshComplete {0}", item.Id.ToString("N"));
             lock (_activeRefreshes)
             {
                 _activeRefreshes.Remove(item.Id);
@@ -974,7 +974,7 @@ namespace MediaBrowser.Providers.Manager
 
         public void OnRefreshProgress(BaseItem item, double progress)
         {
-            //_logger.Info("OnRefreshProgress {0} {1}", item.Id.ToString("N"), progress);
+            //_logger.LogInformation("OnRefreshProgress {0} {1}", item.Id.ToString("N"), progress);
             var id = item.Id;
 
             lock (_activeRefreshes)
@@ -1062,7 +1062,7 @@ namespace MediaBrowser.Providers.Manager
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error refreshing item", ex);
+                    _logger.LogError("Error refreshing item", ex);
                 }
             }
 
@@ -1139,7 +1139,7 @@ namespace MediaBrowser.Providers.Manager
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error refreshing library", ex);
+                _logger.LogError("Error refreshing library", ex);
             }
         }