Merge branch 'hotfix-7.0.1'

Particular · Mar 23, 2017 · 0174029 · 0174029
2 parents 64e863d + c591c75
commit 0174029
Showing 1 changed file with 20 additions and 3 deletions.
diff --git a/src/NServiceBus.Hosting.Windows/WindowsHost.cs b/src/NServiceBus.Hosting.Windows/WindowsHost.cs
@@ -2,12 +2,14 @@ namespace NServiceBus.Hosting.Windows
 {
     using System;
     using System.Collections.Generic;
+    using Logging;
 
     /// <summary>
     /// A windows implementation of the NServiceBus hosting solution
     /// </summary>
     public class WindowsHost : MarshalByRefObject
     {
+        ILog Log = LogManager.GetLogger<WindowsHost>();
         GenericHost genericHost;
 
         /// <summary>
@@ -26,16 +28,31 @@ public WindowsHost(Type endpointType, string[] args, string endpointName, IEnume
         /// </summary>
         public void Start()
         {
-            genericHost.Start().GetAwaiter().GetResult();
+            try
+            {
+                genericHost.Start().GetAwaiter().GetResult();
+            }
+            catch (Exception ex)
+            {
+                Log.Fatal("Start failure", ex);
+                Environment.Exit(-1);
+            }
         }
 
         /// <summary>
         /// Does shutdown work.
         /// </summary>
         public void Stop()
         {
-            genericHost.Stop().GetAwaiter().GetResult();
+            try
+            {
+                genericHost.Stop().GetAwaiter().GetResult();
+            }
+            catch (Exception ex)
+            {
+                Log.Fatal("Stop failure", ex);
+                Environment.Exit(-2);
+            }
         }
-
     }
 }