Merge branch 'hotfix-7.0.2'

Particular · Jul 25, 2017 · 934b0ac · 934b0ac
2 parents 0174029 + 9ffe67b
commit 934b0ac
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/NServiceBus.Hosting.Windows/WindowsHost.cs b/src/NServiceBus.Hosting.Windows/WindowsHost.cs
@@ -9,7 +9,6 @@ namespace NServiceBus.Hosting.Windows
     /// </summary>
     public class WindowsHost : MarshalByRefObject
     {
-        ILog Log = LogManager.GetLogger<WindowsHost>();
         GenericHost genericHost;
 
         /// <summary>
@@ -32,9 +31,10 @@ public void Start()
             {
                 genericHost.Start().GetAwaiter().GetResult();
             }
-            catch (Exception ex)
+            catch (Exception exception)
             {
-                Log.Fatal("Start failure", ex);
+                var log = LogManager.GetLogger<WindowsHost>(); // Defers logger creation to allow custom logging configuration
+                log.Fatal("Start failure", exception);
                 Environment.Exit(-1);
             }
         }
@@ -48,11 +48,12 @@ public void Stop()
             {
                 genericHost.Stop().GetAwaiter().GetResult();
             }
-            catch (Exception ex)
+            catch (Exception exception)
             {
-                Log.Fatal("Stop failure", ex);
+                var log = LogManager.GetLogger<WindowsHost>(); // Defers logger creation to allow custom logging configuration
+                log.Fatal("Stop failure", exception);
                 Environment.Exit(-2);
             }
         }
     }
-}
+}