alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-03 23:36:38 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

extracted more logging dependancies

Browse Source
This commit is contained in:
LukePulverenti
2013-02-21 16:06:23 -05:00
parent 2a2ee4adb3
commit 76f067f867
22 changed files with 153 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
MediaBrowser.Common/Kernel/BaseKernel.cs
View File

@@ -56,7 +56,7 @@ namespace MediaBrowser.Common.Kernel
/// </summary>
internal void OnConfigurationUpdated()
{
EventHelper.QueueEventIfNotNull(ConfigurationUpdated, this, EventArgs.Empty);
EventHelper.QueueEventIfNotNull(ConfigurationUpdated, this, EventArgs.Empty, Logger);
// Notify connected clients
TcpManager.SendWebSocketMessage("ConfigurationUpdated", Configuration);
@@ -73,7 +73,7 @@ namespace MediaBrowser.Common.Kernel
/// </summary>
private void OnLoggerLoaded()
{
EventHelper.QueueEventIfNotNull(LoggerLoaded, this, EventArgs.Empty);
EventHelper.QueueEventIfNotNull(LoggerLoaded, this, EventArgs.Empty, Logger);
}
#endregion
@@ -87,7 +87,7 @@ namespace MediaBrowser.Common.Kernel
/// </summary>
private void OnReloadBeginning()
{
EventHelper.QueueEventIfNotNull(ReloadBeginning, this, EventArgs.Empty);
EventHelper.QueueEventIfNotNull(ReloadBeginning, this, EventArgs.Empty, Logger);
}
#endregion
@@ -101,7 +101,7 @@ namespace MediaBrowser.Common.Kernel
/// </summary>
private void OnReloadCompleted()
{
EventHelper.QueueEventIfNotNull(ReloadCompleted, this, EventArgs.Empty);
EventHelper.QueueEventIfNotNull(ReloadCompleted, this, EventArgs.Empty, Logger);
}
#endregion
@@ -116,7 +116,7 @@ namespace MediaBrowser.Common.Kernel
/// <param name="newVersion">The new version.</param>
public void OnApplicationUpdated(Version newVersion)
{
EventHelper.QueueEventIfNotNull(ApplicationUpdated, this, new GenericEventArgs<Version> { Argument = newVersion });
EventHelper.QueueEventIfNotNull(ApplicationUpdated, this, new GenericEventArgs<Version> { Argument = newVersion }, Logger);
NotifyPendingRestart();
}
@@ -351,9 +351,21 @@ namespace MediaBrowser.Common.Kernel
/// Initializes a new instance of the <see cref="BaseKernel{TApplicationPathsType}" /> class.
/// </summary>
/// <param name="isoManager">The iso manager.</param>
protected BaseKernel(IIsoManager isoManager)
/// <param name="logger">The logger.</param>
protected BaseKernel(IIsoManager isoManager, ILogger logger)
{
if (isoManager == null)
{
throw new ArgumentNullException("isoManager");
}
if (logger == null)
{
throw new ArgumentNullException("logger");
}
IsoManager = isoManager;
Logger = logger;
}
/// <summary>
@@ -362,8 +374,6 @@ namespace MediaBrowser.Common.Kernel
/// <returns>Task.</returns>
public async Task Init()
{
Logger = Logging.LogManager.GetLogger(GetType().Name);
ApplicationPaths = new TApplicationPathsType();
IsFirstRun = !File.Exists(ApplicationPaths.SystemConfigurationFilePath);
@@ -496,7 +506,7 @@ namespace MediaBrowser.Common.Kernel
/// <param name="container">The container.</param>
protected virtual void ComposeExportedValues(CompositionContainer container)
{
container.ComposeExportedValue("logger", Logging.LogManager.GetLogger("App"));
container.ComposeExportedValue("logger", Logger);
}
/// <summary>
@@ -588,7 +598,7 @@ namespace MediaBrowser.Common.Kernel
try
{
plugin.Initialize(this, Logging.LogManager.GetLogger(plugin.GetType().Name));
plugin.Initialize(this, Logger);
Logger.Info("{0} {1} initialized.", plugin.Name, plugin.Version);
}
@@ -609,7 +619,7 @@ namespace MediaBrowser.Common.Kernel
TcpManager.SendWebSocketMessage("HasPendingRestartChanged", GetSystemInfo());
EventHelper.QueueEventIfNotNull(HasPendingRestartChanged, this, EventArgs.Empty);
EventHelper.QueueEventIfNotNull(HasPendingRestartChanged, this, EventArgs.Empty, Logger);
}
/// <summary>
@@ -749,7 +759,7 @@ namespace MediaBrowser.Common.Kernel
{
Logger.Info("Restarting the application");
EventHelper.QueueEventIfNotNull(ApplicationRestartRequested, this, EventArgs.Empty);
EventHelper.QueueEventIfNotNull(ApplicationRestartRequested, this, EventArgs.Empty, Logger);
}
/// <summary>

6
MediaBrowser.Common/Kernel/TcpManager.cs
View File

@@ -150,7 +150,7 @@ namespace MediaBrowser.Common.Kernel
/// <param name="context">The context.</param>
private void OnAlchemyWebSocketClientConnected(UserContext context)
{
var connection = new WebSocketConnection(new AlchemyWebSocket(context), context.ClientAddress, ProcessWebSocketMessageReceived);
var connection = new WebSocketConnection(new AlchemyWebSocket(context, Logger), context.ClientAddress, ProcessWebSocketMessageReceived, Logger);
_webSocketConnections.Add(connection);
}
@@ -173,7 +173,7 @@ namespace MediaBrowser.Common.Kernel
try
{
HttpServer = new HttpServer(Kernel.HttpServerUrlPrefix, "Media Browser", Kernel);
HttpServer = new HttpServer(Kernel.HttpServerUrlPrefix, "Media Browser", Kernel, Logger);
}
catch (HttpListenerException ex)
{
@@ -202,7 +202,7 @@ namespace MediaBrowser.Common.Kernel
/// <param name="e">The <see cref="WebSocketConnectEventArgs" /> instance containing the event data.</param>
void HttpServer_WebSocketConnected(object sender, WebSocketConnectEventArgs e)
{
var connection = new WebSocketConnection(e.WebSocket, e.Endpoint, ProcessWebSocketMessageReceived);
var connection = new WebSocketConnection(e.WebSocket, e.Endpoint, ProcessWebSocketMessageReceived, Logger);
_webSocketConnections.Add(connection);
}