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

Safer instance manager shutdown

Browse Source
This commit is contained in:
Dominion
2023-04-02 21:48:57 -04:00
parent 29f070f21a
commit e08d5ede1a
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/InstanceManager.cs
+15 -2
View File
@@ -461,14 +461,27 @@ namespace Tgstation.Server.Host.Components
logger.LogDebug("Stopping instance manager...");
var instanceFactoryStopTask = instanceFactory.StopAsync(cancellationToken);
await jobManager.StopAsync(cancellationToken);
await Task.WhenAll(instances.Select(x => x.Value.Instance.StopAsync(cancellationToken)));
async Task OfflineInstanceImmediate(IInstance instance, CancellationToken cancellationToken)
{
try
{
await instance.StopAsync(cancellationToken);
}
catch (Exception ex)
{
logger.LogError(ex, "Instance shutdown exception!");
}
}
await Task.WhenAll(instances.Select(x => OfflineInstanceImmediate(x.Value.Instance, cancellationToken)));
await instanceFactoryStopTask;
await swarmService.Shutdown(cancellationToken);
}
catch (Exception ex)
{
logger.LogError(ex, "Instance manager stop exception!");
logger.LogCritical(ex, "Instance manager stop exception!");
}
}