cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-27 23:17:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move Running = false to DisposeAndNullControllers

Browse Source
This commit is contained in:
Jordan Brown
2018-08-18 14:44:20 -04:00
parent 0913e070e6
commit 1a455cc7d9
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs
+2 -3
View File
@@ -187,6 +187,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
alphaServer = null;
bravoServer?.Dispose();
bravoServer = null;
Running = false;
}
/// <summary>
@@ -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<WatchdogLaunchResult> 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!");