From 16b36d4d89abde2026eea57d60109bb3a50772fc Mon Sep 17 00:00:00 2001
From: LukePulverenti <luke.pulverenti@gmail.com>
Date: Mon, 4 Mar 2013 11:31:33 -0500
Subject: fixed multiple log files

---
 .../Logging/LogWindow.xaml.cs                      | 27 ++++++++--------------
 MediaBrowser.ServerApplication/MainWindow.xaml.cs  |  2 +-
 2 files changed, 10 insertions(+), 19 deletions(-)

(limited to 'MediaBrowser.ServerApplication')

diff --git a/MediaBrowser.ServerApplication/Logging/LogWindow.xaml.cs b/MediaBrowser.ServerApplication/Logging/LogWindow.xaml.cs
index 75ef69924..226cd8e87 100644
--- a/MediaBrowser.ServerApplication/Logging/LogWindow.xaml.cs
+++ b/MediaBrowser.ServerApplication/Logging/LogWindow.xaml.cs
@@ -1,4 +1,6 @@
-using NLog;
+using MediaBrowser.Common.Implementations.Logging;
+using MediaBrowser.Model.Logging;
+using NLog;
 using NLog.Config;
 using NLog.Targets;
 using System.ComponentModel;
@@ -18,14 +20,17 @@ namespace MediaBrowser.ServerApplication.Logging
         /// </summary>
         private readonly TaskScheduler _uiThread;
 
+        private readonly ILogManager _logManager;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="LogWindow" /> class.
         /// </summary>
         /// <param name="kernel">The kernel.</param>
-        public LogWindow()
+        public LogWindow(ILogManager logManager)
         {
             InitializeComponent();
             _uiThread = TaskScheduler.FromCurrentSynchronizationContext();
+            _logManager = logManager;
 
             Loaded += LogWindow_Loaded;
         }
@@ -42,6 +47,7 @@ namespace MediaBrowser.ServerApplication.Logging
                 Layout = "${longdate}, ${level}, ${logger}, ${message}"
             };
 
+            ((NlogManager)_logManager).RemoveTarget("LogWindowTraceTarget");
             AddLogTarget(target, "LogWindowTraceTarget");
         }
 
@@ -53,7 +59,7 @@ namespace MediaBrowser.ServerApplication.Logging
         {
             base.OnClosing(e);
 
-            RemoveLogTarget("LogWindowTraceTarget");
+            ((NlogManager) _logManager).RemoveTarget("LogWindowTraceTarget");
         }
 
         /// <summary>
@@ -83,8 +89,6 @@ namespace MediaBrowser.ServerApplication.Logging
         {
             var config = NLog.LogManager.Configuration;
 
-            config.RemoveTarget(name);
-
             target.Name = name;
             config.AddTarget(name, target);
 
@@ -95,19 +99,6 @@ namespace MediaBrowser.ServerApplication.Logging
 
             NLog.LogManager.Configuration = config;
         }
-
-        /// <summary>
-        /// Removes the log target.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        private void RemoveLogTarget(string name)
-        {
-            var config = NLog.LogManager.Configuration;
-
-            config.RemoveTarget(name);
-
-            NLog.LogManager.Configuration = config;
-        }
         
         /// <summary>
         /// Shuts down.
diff --git a/MediaBrowser.ServerApplication/MainWindow.xaml.cs b/MediaBrowser.ServerApplication/MainWindow.xaml.cs
index 9043e007f..22695602c 100644
--- a/MediaBrowser.ServerApplication/MainWindow.xaml.cs
+++ b/MediaBrowser.ServerApplication/MainWindow.xaml.cs
@@ -125,7 +125,7 @@ namespace MediaBrowser.ServerApplication
                 // Add our log window if specified
                 if (_configurationManager.Configuration.ShowLogWindow)
                 {
-                    Trace.Listeners.Add(new WindowTraceListener(new LogWindow()));
+                    Trace.Listeners.Add(new WindowTraceListener(new LogWindow(_logManager)));
                 }
                 else
                 {
-- 
cgit v1.2.3