From 931c0ea455161b8ee00005a0ffd1f8afab41f7bb Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Thu, 21 Feb 2013 16:39:53 -0500 Subject: more dependancy injection --- MediaBrowser.Common/Kernel/BaseKernel.cs | 6 +++--- MediaBrowser.Common/Kernel/BaseManager.cs | 20 +++--------------- MediaBrowser.Common/Kernel/TcpManager.cs | 35 +++++++++++++++++++------------ 3 files changed, 28 insertions(+), 33 deletions(-) (limited to 'MediaBrowser.Common/Kernel') diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs index 48a7d62bf3..2b2063b550 100644 --- a/MediaBrowser.Common/Kernel/BaseKernel.cs +++ b/MediaBrowser.Common/Kernel/BaseKernel.cs @@ -412,18 +412,18 @@ namespace MediaBrowser.Common.Kernel Logger.Info("Version {0} initializing", ApplicationVersion); DisposeHttpManager(); - HttpManager = new HttpManager(this); + HttpManager = new HttpManager(this, Logger); await OnConfigurationLoaded().ConfigureAwait(false); DisposeTaskManager(); - TaskManager = new TaskManager(this); + TaskManager = new TaskManager(this, Logger); Logger.Info("Loading Plugins"); await ReloadComposableParts().ConfigureAwait(false); DisposeTcpManager(); - TcpManager = new TcpManager(this); + TcpManager = new TcpManager(this, Logger); } /// diff --git a/MediaBrowser.Common/Kernel/BaseManager.cs b/MediaBrowser.Common/Kernel/BaseManager.cs index 565e4295ee..3d830caef5 100644 --- a/MediaBrowser.Common/Kernel/BaseManager.cs +++ b/MediaBrowser.Common/Kernel/BaseManager.cs @@ -1,6 +1,4 @@ -using MediaBrowser.Common.Logging; -using MediaBrowser.Model.Logging; -using System; +using System; namespace MediaBrowser.Common.Kernel { @@ -9,14 +7,8 @@ namespace MediaBrowser.Common.Kernel /// /// The type of the T kernel type. public abstract class BaseManager : IDisposable - where TKernelType : IKernel + where TKernelType : class, IKernel { - /// - /// Gets the logger. - /// - /// The logger. - protected ILogger Logger { get; private set; } - /// /// The _kernel /// @@ -33,12 +25,8 @@ namespace MediaBrowser.Common.Kernel { throw new ArgumentNullException("kernel"); } - + Kernel = kernel; - - Logger = LogManager.GetLogger(GetType().Name); - - Logger.Info("Initializing"); } /// @@ -46,8 +34,6 @@ namespace MediaBrowser.Common.Kernel /// public void Dispose() { - Logger.Info("Disposing"); - Dispose(true); GC.SuppressFinalize(this); } diff --git a/MediaBrowser.Common/Kernel/TcpManager.cs b/MediaBrowser.Common/Kernel/TcpManager.cs index 155d3c4a2a..7fb624f73b 100644 --- a/MediaBrowser.Common/Kernel/TcpManager.cs +++ b/MediaBrowser.Common/Kernel/TcpManager.cs @@ -3,6 +3,7 @@ using Alchemy.Classes; using MediaBrowser.Common.Net; using MediaBrowser.Common.Serialization; using MediaBrowser.Model.Configuration; +using MediaBrowser.Model.Logging; using System; using System.Collections.Generic; using System.Diagnostics; @@ -59,6 +60,11 @@ namespace MediaBrowser.Common.Kernel /// The external web socket server. private WebSocketServer ExternalWebSocketServer { get; set; } + /// + /// The _logger + /// + private readonly ILogger _logger; + /// /// The _supports native web socket /// @@ -103,9 +109,12 @@ namespace MediaBrowser.Common.Kernel /// Initializes a new instance of the class. /// /// The kernel. - public TcpManager(IKernel kernel) + /// The logger. + public TcpManager(IKernel kernel, ILogger logger) : base(kernel) { + _logger = logger; + if (kernel.IsFirstRun) { RegisterServerWithAdministratorAccess(); @@ -141,7 +150,7 @@ namespace MediaBrowser.Common.Kernel ExternalWebSocketServer.Start(); - Logger.Info("Alchemy Web Socket Server started"); + _logger.Info("Alchemy Web Socket Server started"); } /// @@ -150,7 +159,7 @@ namespace MediaBrowser.Common.Kernel /// The context. private void OnAlchemyWebSocketClientConnected(UserContext context) { - var connection = new WebSocketConnection(new AlchemyWebSocket(context, Logger), context.ClientAddress, ProcessWebSocketMessageReceived, Logger); + var connection = new WebSocketConnection(new AlchemyWebSocket(context, _logger), context.ClientAddress, ProcessWebSocketMessageReceived, _logger); _webSocketConnections.Add(connection); } @@ -169,15 +178,15 @@ namespace MediaBrowser.Common.Kernel DisposeHttpServer(); - Logger.Info("Loading Http Server"); + _logger.Info("Loading Http Server"); try { - HttpServer = new HttpServer(Kernel.HttpServerUrlPrefix, "Media Browser", Kernel, Logger); + HttpServer = new HttpServer(Kernel.HttpServerUrlPrefix, "Media Browser", Kernel, _logger); } catch (HttpListenerException ex) { - Logger.ErrorException("Error starting Http Server", ex); + _logger.ErrorException("Error starting Http Server", ex); if (registerServerOnFailure) { @@ -202,7 +211,7 @@ namespace MediaBrowser.Common.Kernel /// The instance containing the event data. void HttpServer_WebSocketConnected(object sender, WebSocketConnectEventArgs e) { - var connection = new WebSocketConnection(e.WebSocket, e.Endpoint, ProcessWebSocketMessageReceived, Logger); + var connection = new WebSocketConnection(e.WebSocket, e.Endpoint, ProcessWebSocketMessageReceived, _logger); _webSocketConnections.Add(connection); } @@ -221,7 +230,7 @@ namespace MediaBrowser.Common.Kernel } catch (Exception ex) { - Logger.ErrorException("{0} failed processing WebSocket message {1}", ex, i.GetType().Name, result.MessageType); + _logger.ErrorException("{0} failed processing WebSocket message {1}", ex, i.GetType().Name, result.MessageType); } })); @@ -254,7 +263,7 @@ namespace MediaBrowser.Common.Kernel } catch (SocketException ex) { - Logger.ErrorException("Failed to start UDP Server", ex); + _logger.ErrorException("Failed to start UDP Server", ex); return; } @@ -265,7 +274,7 @@ namespace MediaBrowser.Common.Kernel if (expectedMessageBytes.SequenceEqual(res.Buffer)) { - Logger.Info("Received UDP server request from " + res.RemoteEndPoint.ToString()); + _logger.Info("Received UDP server request from " + res.RemoteEndPoint.ToString()); // Send a response back with our ip address and port var response = String.Format("MediaBrowser{0}|{1}:{2}", Kernel.KernelContext, NetUtils.GetLocalIpAddress(), Kernel.UdpServerPortNumber); @@ -330,7 +339,7 @@ namespace MediaBrowser.Common.Kernel if (connections.Count > 0) { - Logger.Info("Sending web socket message {0}", messageType); + _logger.Info("Sending web socket message {0}", messageType); var message = new WebSocketMessage { MessageType = messageType, Data = dataFunction() }; var bytes = JsonSerializer.SerializeToBytes(message); @@ -347,7 +356,7 @@ namespace MediaBrowser.Common.Kernel } catch (Exception ex) { - Logger.ErrorException("Error sending web socket message {0} to {1}", ex, messageType, s.RemoteEndPoint); + _logger.ErrorException("Error sending web socket message {0} to {1}", ex, messageType, s.RemoteEndPoint); } })); @@ -386,7 +395,7 @@ namespace MediaBrowser.Common.Kernel if (HttpServer != null) { - Logger.Info("Disposing Http Server"); + _logger.Info("Disposing Http Server"); HttpServer.WebSocketConnected -= HttpServer_WebSocketConnected; HttpServer.Dispose(); -- cgit v1.2.3