extracted more logging dependancies

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

View File

@@ -3,6 +3,7 @@ using MediaBrowser.Common.Logging;
using MediaBrowser.Common.UI;
using MediaBrowser.Controller;
using MediaBrowser.IsoMounter;
using MediaBrowser.Model.Logging;
using MediaBrowser.Server.Uninstall;
using MediaBrowser.ServerApplication.Implementations;
using System;
@@ -24,7 +25,10 @@ namespace MediaBrowser.ServerApplication
[STAThread]
public static void Main()
{
RunApplication<App>("MediaBrowserServer");
var application = new App(LogManager.GetLogger("App"));
application.InitializeComponent();
application.Run();
}
/// <summary>
@@ -39,6 +43,16 @@ namespace MediaBrowser.ServerApplication
}
}
/// <summary>
/// Initializes a new instance of the <see cref="App" /> class.
/// </summary>
/// <param name="logger">The logger.</param>
public App(ILogger logger)
: base(logger)
{
}
/// <summary>
/// Gets the name of the product.
/// </summary>
@@ -170,7 +184,7 @@ namespace MediaBrowser.ServerApplication
/// <returns>IKernel.</returns>
protected override IKernel InstantiateKernel()
{
return new Kernel(new PismoIsoManager(LogManager.GetLogger("PismoIsoManager")), new DotNetZipClient(), new BdInfoExaminer());
return new Kernel(new PismoIsoManager(Logger), new DotNetZipClient(), new BdInfoExaminer(), Logger);
}
/// <summary>
@@ -179,7 +193,7 @@ namespace MediaBrowser.ServerApplication
/// <returns>Window.</returns>
protected override Window InstantiateMainWindow()
{
return new MainWindow(LogManager.GetLogger("MainWindow"));
return new MainWindow(Logger);
}
}
}

View File

@@ -160,7 +160,7 @@ namespace MediaBrowser.ServerApplication
// Show the notification
if (newItems.Count == 1)
{
Dispatcher.InvokeAsync(() => MbTaskbarIcon.ShowCustomBalloon(new ItemUpdateNotification(LogManager.GetLogger("ItemUpdateNotification"))
Dispatcher.InvokeAsync(() => MbTaskbarIcon.ShowCustomBalloon(new ItemUpdateNotification(_logger)
{
DataContext = newItems[0]
@@ -168,7 +168,7 @@ namespace MediaBrowser.ServerApplication
}
else if (newItems.Count > 1)
{
Dispatcher.InvokeAsync(() => MbTaskbarIcon.ShowCustomBalloon(new MultiItemUpdateNotification(LogManager.GetLogger("ItemUpdateNotification"))
Dispatcher.InvokeAsync(() => MbTaskbarIcon.ShowCustomBalloon(new MultiItemUpdateNotification(_logger)
{
DataContext = newItems