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

Merge pull request #839 from tgstation/838-FixReattachFail

Browse Source 
Do not releaseServers if StopAsync fails
This commit is contained in:
Jordan Brown
2018-12-23 15:27:20 -05:00
committed by GitHub
parent 1e4bd33a85 c803b508ab
commit 9ac5fd9709
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs
+19 -11
View File
@@ -996,20 +996,28 @@ namespace Tgstation.Server.Host.Components.Watchdog
/// <inheritdoc />
public async Task StopAsync(CancellationToken cancellationToken)
{
if (releaseServers && Running)
try
{
await StopMonitor().ConfigureAwait(false);
var reattachInformation = new WatchdogReattachInformation
if (releaseServers && Running)
{
AlphaIsActive = AlphaIsActive
};
reattachInformation.Alpha = alphaServer?.Release();
reattachInformation.Bravo = bravoServer?.Release();
await reattachInfoHandler.Save(reattachInformation, cancellationToken).ConfigureAwait(false);
}
await StopMonitor().ConfigureAwait(false);
await Terminate(false, cancellationToken).ConfigureAwait(false);
var reattachInformation = new WatchdogReattachInformation
{
AlphaIsActive = AlphaIsActive
};
reattachInformation.Alpha = alphaServer?.Release();
reattachInformation.Bravo = bravoServer?.Release();
await reattachInfoHandler.Save(reattachInformation, cancellationToken).ConfigureAwait(false);
}
await Terminate(false, cancellationToken).ConfigureAwait(false);
}
catch
{
releaseServers = false;
throw;
}
}
/// <inheritdoc />