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

Remove redundant checks in SendRawTopic

Browse Source
This commit is contained in:
Jordan Dominion
2023-11-18 22:20:11 -05:00
parent 882e08f0e1
commit 0e7cf63d74
1 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Session/SessionController.cs
+11 -24
View File
@@ -1097,7 +1097,6 @@ namespace Tgstation.Server.Host.Components.Session
}
var targetPort = ReattachInformation.Port;
var killedOrRebootedTask = Task.WhenAny(Lifetime, OnReboot);
global::Byond.TopicSender.TopicResponse byondResponse = null;
var firstSend = true;
@@ -1109,43 +1108,31 @@ namespace Tgstation.Server.Host.Components.Session
try
{
firstSend = false;
if (!killedOrRebootedTask.IsCompleted)
{
Logger.LogTrace("Begin topic request");
byondResponse = await byondTopicSender.SendTopic(
endpoint,
queryString,
cancellationToken);
Logger.LogTrace("End topic request");
}
Logger.LogTrace("Begin topic request");
byondResponse = await byondTopicSender.SendTopic(
endpoint,
queryString,
cancellationToken);
Logger.LogTrace("End topic request");
break;
}
catch (Exception ex) when (!cancellationToken.IsCancellationRequested)
catch (Exception ex) when (ex is not OperationCanceledException)
{
Logger.LogWarning(ex, "SendTopic exception!{retryDetails}", priority ? $" {i} attempts remaining." : String.Empty);
if (priority && i > 0)
{
var delayTask = asyncDelayer.Delay(TimeSpan.FromSeconds(2), cancellationToken);
await Task.WhenAny(killedOrRebootedTask, delayTask);
}
await asyncDelayer.Delay(TimeSpan.FromSeconds(2), cancellationToken);
}
}
if (byondResponse == null)
{
if (priority)
if (killedOrRebootedTask.IsCompleted)
Logger.LogWarning(
"Unable to send priority topic \"{queryString}\" DreamDaemon {stateClearAction}!",
queryString,
Lifetime.IsCompleted ? "process ended" : "rebooted");
else
Logger.LogError(
"Unable to send priority topic \"{queryString}\"!",
queryString);
Logger.LogError(
"Unable to send priority topic \"{queryString}\"!",
queryString);
return null;
}