3 files changed, 15 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/IO/DirectoryWatchers.cs b/MediaBrowser.Controller/IO/DirectoryWatchers.cs
index 29353bc25..4eaa6e7d3 100644
--- a/MediaBrowser.Controller/IO/DirectoryWatchers.cs
+++ b/MediaBrowser.Controller/IO/DirectoryWatchers.cs
@@ -70,9 +70,14 @@ namespace MediaBrowser.Controller.IO
         /// <summary>
         /// Initializes a new instance of the <see cref="DirectoryWatchers" /> class.
         /// </summary>
-        public DirectoryWatchers()
+        public DirectoryWatchers(ILogger logger)
         {
-            Logger = LogManager.GetLogger(GetType().Name);
+            if (logger == null)
+            {
+                throw new ArgumentNullException("logger");
+            }
+
+            Logger = logger;
         }
         
         /// <summary>
diff --git a/MediaBrowser.Controller/IO/FileData.cs b/MediaBrowser.Controller/IO/FileData.cs
index 74d0a7e6f..b94034913 100644
--- a/MediaBrowser.Controller/IO/FileData.cs
+++ b/MediaBrowser.Controller/IO/FileData.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Common.Logging;
 using MediaBrowser.Common.Win32;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -15,6 +16,11 @@ namespace MediaBrowser.Controller.IO
     public static class FileData
     {
         /// <summary>
+        /// The logger
+        /// </summary>
+        private static readonly ILogger Logger = LogManager.GetLogger("FileData");
+        
+        /// <summary>
         /// Gets all file system entries within a foler
         /// </summary>
         /// <param name="path">The path.</param>
@@ -87,7 +93,7 @@ namespace MediaBrowser.Controller.IO
                     if (string.IsNullOrWhiteSpace(newPath))
                     {
                         //invalid shortcut - could be old or target could just be unavailable
-                        Logger.LogWarning("Encountered invalid shortuct: "+lpFindFileData.Path);
+                        Logger.Warn("Encountered invalid shortuct: "+lpFindFileData.Path);
                         continue;
                     }
                     var data = FileSystem.GetFileData(newPath);
diff --git a/MediaBrowser.Controller/IO/FileSystemManager.cs b/MediaBrowser.Controller/IO/FileSystemManager.cs
index e33983489..359a77d60 100644
--- a/MediaBrowser.Controller/IO/FileSystemManager.cs
+++ b/MediaBrowser.Controller/IO/FileSystemManager.cs
@@ -28,7 +28,7 @@ namespace MediaBrowser.Controller.IO
         public FileSystemManager(Kernel kernel)
             : base(kernel)
         {
-            DirectoryWatchers = new DirectoryWatchers();
+            DirectoryWatchers = new DirectoryWatchers(Logger);
         }
 
         /// <summary>