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

More guards against sending topic requests while the server is starting or rebooting

Browse Source
This commit is contained in:
Jordan Dominion
2023-11-18 22:16:34 -05:00
parent d744504fa8
commit 882e08f0e1
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Session/SessionController.cs
+17 -3
View File
@@ -432,18 +432,32 @@ namespace Tgstation.Server.Host.Components.Session
return null;
}
var rebootGate = RebootGate;
var launchResult = await LaunchResult.WaitAsync(cancellationToken);
if (launchResult.ExitCode.HasValue)
{
Logger.LogDebug("Not sending topic request {commandType} to server that failed to launch!", parameters.CommandType);
return null;
}
// meh, this is kind of a hack, but it works
if (!chatTrackingContext.Active)
{
Logger.LogDebug("Not sending topic request {commandType} to server that is rebooting/starting.", parameters.CommandType);
return null;
}
using var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
var combinedCancellationToken = cts.Token;
async ValueTask CancelIfLifetimeElapses()
{
try
{
var lifetime = Lifetime;
var completed = await Task.WhenAny(lifetime, RebootGate).WaitAsync(combinedCancellationToken);
var completed = await Task.WhenAny(Lifetime, rebootGate).WaitAsync(combinedCancellationToken);
Logger.LogDebug(
"Server {action}, cancelling pending command: {commandType}",
completed == lifetime
completed != rebootGate
? "process ended"
: "rebooting",
parameters.CommandType);