diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index 145171fd83..16175783fd 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -178,8 +178,6 @@ namespace MediaBrowser.Controller
BaseItem.Logger = logger;
Ratings.Logger = logger;
LocalizedStrings.Logger = logger;
- // For now, until this can become an interface
- BaseMetadataProvider.Logger = logger;
}
///
diff --git a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
index e16519864e..f6c6ed3036 100644
--- a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
+++ b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
@@ -16,7 +16,8 @@ namespace MediaBrowser.Controller.Providers
/// Gets the logger.
///
/// The logger.
- protected static internal ILogger Logger { get; internal set; }
+ protected ILogger Logger { get; set; }
+ protected ILogManager LogManager { get; set; }
// Cache these since they will be used a lot
///
@@ -102,8 +103,11 @@ namespace MediaBrowser.Controller.Providers
///
/// Initializes a new instance of the class.
///
- protected BaseMetadataProvider()
+ protected BaseMetadataProvider(ILogManager logManager)
{
+ Logger = logManager.GetLogger(GetType().Name);
+ LogManager = logManager;
+
Initialize();
}
diff --git a/MediaBrowser.Controller/Providers/FanartBaseProvider.cs b/MediaBrowser.Controller/Providers/FanartBaseProvider.cs
index 3063f3c9e1..7a38fbb7a8 100644
--- a/MediaBrowser.Controller/Providers/FanartBaseProvider.cs
+++ b/MediaBrowser.Controller/Providers/FanartBaseProvider.cs
@@ -1,5 +1,6 @@
using MediaBrowser.Controller.Entities;
using System;
+using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers
{
@@ -34,6 +35,10 @@ namespace MediaBrowser.Controller.Providers
///
protected const string APIKey = "5c6b04c68e904cfed1e6cbc9a9e683d4";
+ protected FanartBaseProvider(ILogManager logManager) : base(logManager)
+ {
+ }
+
///
/// Needses the refresh internal.
///
diff --git a/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs b/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs
index 16b120ebdc..1baa1ed558 100644
--- a/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs
+++ b/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs
@@ -4,6 +4,7 @@ using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
+using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers
{
@@ -12,6 +13,10 @@ namespace MediaBrowser.Controller.Providers
///
public class FolderProviderFromXml : BaseMetadataProvider
{
+ public FolderProviderFromXml(ILogManager logManager) : base(logManager)
+ {
+ }
+
///
/// Supportses the specified item.
///
diff --git a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
index b992c35d95..ddf9e3334c 100644
--- a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
+++ b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
@@ -7,6 +7,7 @@ using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
+using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers
{
@@ -15,6 +16,10 @@ namespace MediaBrowser.Controller.Providers
///
public class ImageFromMediaLocationProvider : BaseMetadataProvider
{
+ public ImageFromMediaLocationProvider(ILogManager logManager) : base(logManager)
+ {
+ }
+
///
/// Supportses the specified item.
///
diff --git a/MediaBrowser.Controller/Providers/ImagesByNameProvider.cs b/MediaBrowser.Controller/Providers/ImagesByNameProvider.cs
index fa1fb2a9c4..1521b514ce 100644
--- a/MediaBrowser.Controller/Providers/ImagesByNameProvider.cs
+++ b/MediaBrowser.Controller/Providers/ImagesByNameProvider.cs
@@ -4,6 +4,7 @@ using System;
using System.Globalization;
using System.IO;
using System.Linq;
+using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers
{
@@ -12,6 +13,10 @@ namespace MediaBrowser.Controller.Providers
///
public class ImagesByNameProvider : ImageFromMediaLocationProvider
{
+ public ImagesByNameProvider(ILogManager logManager) : base(logManager)
+ {
+ }
+
///
/// Supportses the specified item.
///
diff --git a/MediaBrowser.Controller/Providers/MediaInfo/BaseFFMpegImageProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/BaseFFMpegImageProvider.cs
index 95b70044a4..8ca080e9b8 100644
--- a/MediaBrowser.Controller/Providers/MediaInfo/BaseFFMpegImageProvider.cs
+++ b/MediaBrowser.Controller/Providers/MediaInfo/BaseFFMpegImageProvider.cs
@@ -1,10 +1,15 @@
using MediaBrowser.Controller.Entities;
+using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers.MediaInfo
{
public abstract class BaseFFMpegImageProvider : BaseFFMpegProvider
where T : BaseItem
{
+ protected BaseFFMpegImageProvider(ILogManager logManager) : base(logManager)
+ {
+ }
+
///
/// Gets the priority.
///
diff --git a/MediaBrowser.Controller/Providers/MediaInfo/BaseFFMpegProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/BaseFFMpegProvider.cs
index 605c03414f..e3f0d16a74 100644
--- a/MediaBrowser.Controller/Providers/MediaInfo/BaseFFMpegProvider.cs
+++ b/MediaBrowser.Controller/Providers/MediaInfo/BaseFFMpegProvider.cs
@@ -3,6 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Entities;
using System;
using System.Threading.Tasks;
+using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers.MediaInfo
{
@@ -13,6 +14,10 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
public abstract class BaseFFMpegProvider : BaseMetadataProvider
where T : BaseItem
{
+ protected BaseFFMpegProvider(ILogManager logManager) : base(logManager)
+ {
+ }
+
///
/// Supportses the specified item.
///
diff --git a/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs
index bb2b82819c..e0633d97dd 100644
--- a/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs
+++ b/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs
@@ -8,6 +8,7 @@ using System.Collections.Generic;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
+using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers.MediaInfo
{
@@ -18,6 +19,10 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
public abstract class BaseFFProbeProvider : BaseFFMpegProvider
where T : BaseItem
{
+ protected BaseFFProbeProvider(ILogManager logManager) : base(logManager)
+ {
+ }
+
///
/// Gets or sets the FF probe cache.
///
diff --git a/MediaBrowser.Controller/Providers/MediaInfo/FFMpegAudioImageProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/FFMpegAudioImageProvider.cs
index 907c692b80..581cd4e092 100644
--- a/MediaBrowser.Controller/Providers/MediaInfo/FFMpegAudioImageProvider.cs
+++ b/MediaBrowser.Controller/Providers/MediaInfo/FFMpegAudioImageProvider.cs
@@ -5,6 +5,7 @@ using System;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
+using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers.MediaInfo
{
@@ -13,7 +14,10 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
///
public class FFMpegAudioImageProvider : BaseFFMpegImageProvider