From 1a455cc7d9e97071841ac5c704a9da2e00708fca Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 18 Aug 2018 14:44:20 -0400 Subject: [PATCH] Move Running = false to DisposeAndNullControllers --- src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs index 70aabb3302..c9a8813395 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs @@ -187,6 +187,7 @@ namespace Tgstation.Server.Host.Components.Watchdog alphaServer = null; bravoServer?.Dispose(); bravoServer = null; + Running = false; } /// @@ -232,7 +233,6 @@ namespace Tgstation.Server.Host.Components.Watchdog var chatTask = announce ? chat.SendWatchdogMessage("Terminating...", cancellationToken) : Task.CompletedTask; await StopMonitor().ConfigureAwait(false); DisposeAndNullControllers(); - Running = false; await chatTask.ConfigureAwait(false); return; } @@ -411,7 +411,6 @@ namespace Tgstation.Server.Host.Components.Watchdog case Components.Watchdog.RebootState.Shutdown: await chat.SendWatchdogMessage("Active server rebooted! Exiting due to graceful termination request...", cancellationToken).ConfigureAwait(false); DisposeAndNullControllers(); - Running = false; monitorState.NextAction = MonitorAction.Exit; return; } @@ -626,9 +625,9 @@ namespace Tgstation.Server.Host.Components.Watchdog async Task LaunchNoLock(bool startMonitor, bool announce, bool doReattach, CancellationToken cancellationToken) { + logger.LogTrace("Begin LaunchNoLock"); using (var alphaStartCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken)) { - logger.LogTrace("Begin LaunchNoLock"); if (Running) { logger.LogTrace("Aborted due to already running!");