2 files changed, 26 insertions, 22 deletions

diff --git a/MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs b/MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs
index f725b0222..144997c73 100644
--- a/MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs
+++ b/MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs
@@ -1,12 +1,13 @@
 using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Kernel;
+using MediaBrowser.Controller;
+using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using MediaBrowser.Model.Logging;
 
 namespace MediaBrowser.Api.WebSocket
 {
@@ -14,7 +15,7 @@ namespace MediaBrowser.Api.WebSocket
     /// Class ScheduledTasksWebSocketListener
     /// </summary>
     [Export(typeof(IWebSocketListener))]
-    public class LogFileWebSocketListener : BasePeriodicWebSocketListener<IKernel, IEnumerable<string>, LogFileWebSocketState>
+    public class LogFileWebSocketListener : BasePeriodicWebSocketListener<IEnumerable<string>, LogFileWebSocketState>
     {
         /// <summary>
         /// Gets the name.
@@ -26,25 +27,21 @@ namespace MediaBrowser.Api.WebSocket
         }
 
         /// <summary>
+        /// The _kernel
+        /// </summary>
+        private readonly IKernel _kernel;
+        
+        /// <summary>
         /// Initializes a new instance of the <see cref="LogFileWebSocketListener" /> class.
         /// </summary>
         /// <param name="logger">The logger.</param>
+        /// <param name="kernel">The kernel.</param>
         [ImportingConstructor]
-        public LogFileWebSocketListener([Import("logger")] ILogger logger)
+        public LogFileWebSocketListener([Import("logger")] ILogger logger, [Import("kernel")] Kernel kernel)
             : base(logger)
         {
-
-        }
-
-        /// <summary>
-        /// Initializes the specified kernel.
-        /// </summary>
-        /// <param name="kernel">The kernel.</param>
-        public override void Initialize(IKernel kernel)
-        {
-            base.Initialize(kernel);
-
-            kernel.LoggerLoaded += kernel_LoggerLoaded;
+            _kernel = kernel;
+            _kernel.LoggerLoaded += kernel_LoggerLoaded;
         }
 
         /// <summary>
@@ -54,9 +51,9 @@ namespace MediaBrowser.Api.WebSocket
         /// <returns>IEnumerable{System.String}.</returns>
         protected override async Task<IEnumerable<string>> GetDataToSend(LogFileWebSocketState state)
         {
-            if (!string.Equals(Kernel.LogFilePath, state.LastLogFilePath))
+            if (!string.Equals(_kernel.LogFilePath, state.LastLogFilePath))
             {
-                state.LastLogFilePath = Kernel.LogFilePath;
+                state.LastLogFilePath = _kernel.LogFilePath;
                 state.StartLine = 0;
             }
 
@@ -75,7 +72,7 @@ namespace MediaBrowser.Api.WebSocket
         {
             if (dispose)
             {
-                Kernel.LoggerLoaded -= kernel_LoggerLoaded;
+                _kernel.LoggerLoaded -= kernel_LoggerLoaded;
             }
             base.Dispose(dispose);
         }
diff --git a/MediaBrowser.Api/WebSocket/SystemInfoWebSocketListener.cs b/MediaBrowser.Api/WebSocket/SystemInfoWebSocketListener.cs
index 51d9f2fcd..c41714581 100644
--- a/MediaBrowser.Api/WebSocket/SystemInfoWebSocketListener.cs
+++ b/MediaBrowser.Api/WebSocket/SystemInfoWebSocketListener.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Common.Kernel;
+using MediaBrowser.Controller;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.System;
 using System.ComponentModel.Composition;
@@ -10,7 +11,7 @@ namespace MediaBrowser.Api.WebSocket
     /// Class SystemInfoWebSocketListener
     /// </summary>
     [Export(typeof(IWebSocketListener))]
-    public class SystemInfoWebSocketListener : BasePeriodicWebSocketListener<IKernel, SystemInfo, object>
+    public class SystemInfoWebSocketListener : BasePeriodicWebSocketListener<SystemInfo, object>
     {
         /// <summary>
         /// Gets the name.
@@ -22,14 +23,20 @@ namespace MediaBrowser.Api.WebSocket
         }
 
         /// <summary>
+        /// The _kernel
+        /// </summary>
+        private readonly IKernel _kernel;
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="SystemInfoWebSocketListener" /> class.
         /// </summary>
+        /// <param name="kernel">The kernel.</param>
         /// <param name="logger">The logger.</param>
         [ImportingConstructor]
-        public SystemInfoWebSocketListener([Import("logger")] ILogger logger)
+        public SystemInfoWebSocketListener([Import("kernel")] Kernel kernel, [Import("logger")] ILogger logger)
             : base(logger)
         {
-            
+            _kernel = kernel;
         }
 
         /// <summary>
@@ -39,7 +46,7 @@ namespace MediaBrowser.Api.WebSocket
         /// <returns>Task{SystemInfo}.</returns>
         protected override Task<SystemInfo> GetDataToSend(object state)
         {
-            return Task.FromResult(Kernel.GetSystemInfo());
+            return Task.FromResult(_kernel.GetSystemInfo());
         }
     }
 }