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

Fix possible suspension issues with windows watchdog

Browse Source
This commit is contained in:
Jordan Brown
2020-05-04 03:21:13 -04:00
parent c633541ee1
commit 9fcf608370
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Watchdog/WindowsWatchdog.cs
+16 -3
View File
@@ -154,23 +154,36 @@ namespace Tgstation.Server.Host.Components.Watchdog
}
WindowsSwappableDmbProvider windowsProvider = null;
bool suspended = false;
try
{
windowsProvider = new WindowsSwappableDmbProvider(compileJobProvider, ioManager, symlinkFactory);
Logger.LogDebug("Swapping to compile job {0}...", windowsProvider.CompileJob.Id);
Server.Suspend();
try
{
Server.Suspend();
suspended = true;
}
catch (Exception ex)
{
Logger.LogWarning("Exception while suspending server: {0}", ex);
}
await windowsProvider.MakeActive(cancellationToken).ConfigureAwait(false);
Server.Resume();
}
catch(Exception ex)
{
Logger.LogDebug("Exception while swapping: {0}", ex);
Logger.LogError("Exception while swapping: {0}", ex);
IDmbProvider providerToDispose = windowsProvider ?? compileJobProvider;
providerToDispose.Dispose();
throw;
}
// Let this throw hard if it fails
if (suspended)
Server.Resume();
pendingSwappable?.Dispose();
pendingSwappable = windowsProvider;
}