unkin/jellyfin-ha-src
4
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases Wiki Activity

Use Microsoft.Extensions.Logging abstraction

Browse Source
This commit is contained in:
Bond_009
2018-12-13 14:18:25 +01:00
parent b0fd432126
commit 0f8b3c6347
310 changed files with 1421 additions and 2058 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MediaBrowser.Providers/Manager/ProviderManager.cs
+18 -18
View File
@@ -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);
}
}