Added ExitCode for unhandled exception so that service restarts

playerx · Mar 23, 2013 · 32c92ae · 32c92ae
1 parent 47fcda1
commit 32c92ae
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/SampleTopshelfService/Program.cs b/src/SampleTopshelfService/Program.cs
@@ -33,8 +33,6 @@ static int Main()
                             r.RestartService(0);
                             r.RestartService(0);
                             r.RestartService(0);
-
-                            r.OnCrashOnly();
                         });
 
                     x.AddCommandLineSwitch("throwonstart", v => throwOnStart = v);

diff --git a/src/Topshelf/Runtime/Windows/WindowsServiceHost.cs b/src/Topshelf/Runtime/Windows/WindowsServiceHost.cs
@@ -200,7 +200,8 @@ protected override void OnShutdown()
             }
             catch (Exception ex)
             {
-                _log.Fatal("The service did not shut down gracefully", ex);
+                _log.Fatal("The service did not shut down gracefully", ex);
+                ExitCode = (int)TopshelfExitCode.StopServiceFailed;
                 throw;
             }
         }
@@ -220,7 +221,9 @@ protected override void Dispose(bool disposing)
 
         void CatchUnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
-            _log.Error("The service threw an unhandled exception", (Exception)e.ExceptionObject);
+            _log.Error("The service threw an unhandled exception", (Exception)e.ExceptionObject);
+
+            ExitCode = (int)TopshelfExitCode.UnhandledServiceException;
 
             Stop();
 

diff --git a/src/Topshelf/TopshelfExitCode.cs b/src/Topshelf/TopshelfExitCode.cs
@@ -22,5 +22,6 @@ public enum TopshelfExitCode
         StartServiceFailed = 5,
         StopServiceFailed = 6,
         ServiceAlreadyRunning = 7,
+        UnhandledServiceException = 8,
     }
 }