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

Fix issue with reattached servers never updating until a new deployment is made

Browse Source
This commit is contained in:
Dominion
2023-04-03 15:16:20 -04:00
parent 01aa580fb8
commit ba3bbf486e
1 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
+39 -7
View File
@@ -770,6 +770,28 @@ namespace Tgstation.Server.Host.Components.Watchdog
}
}
/// <summary>
/// Check for a new <see cref="IDmbProvider"/>.
/// </summary>
/// <param name="currentCompileJob">The session's current <see cref="CompileJob"/>.</param>
/// <returns>A <see cref="Task"/> that completes if and when a newer <see cref="CompileJob"/> is available.</returns>
Task InitialCheckDmbUpdated(CompileJob currentCompileJob)
{
var factoryTask = DmbFactory.OnNewerDmb;
var latestCompileJob = DmbFactory.LatestCompileJob();
if (latestCompileJob == null)
return factoryTask;
if (latestCompileJob.Id != currentCompileJob.Id)
{
Logger.LogDebug("Found new CompileJob without waiting");
return Task.CompletedTask;
}
return factoryTask;
}
/// <summary>
/// The main loop of the watchdog. Ayschronously waits for events to occur and then responds to them.
/// </summary>
@@ -792,6 +814,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
activeLaunchParametersChanged = null,
newDmbAvailable = null;
ISessionController lastController = null;
var ranInitialDmbCheck = false;
for (ulong iteration = 1; nextAction != MonitorAction.Exit; ++iteration)
using (LogContext.PushProperty("Monitor", iteration))
try
@@ -803,19 +826,19 @@ namespace Tgstation.Server.Host.Components.Watchdog
void UpdateMonitoredTasks()
{
static void TryUpdateTask(ref Task oldTask, Task newTask)
static void TryUpdateTask(ref Task oldTask, Func<Task> newTaskFactory)
{
if (oldTask?.IsCompleted == true)
return;
oldTask = newTask;
oldTask = newTaskFactory();
}
if (lastController == controller)
{
TryUpdateTask(ref activeServerLifetime, controller.Lifetime);
TryUpdateTask(ref activeServerReboot, controller.OnReboot);
TryUpdateTask(ref serverPrimed, controller.OnPrime);
TryUpdateTask(ref activeServerLifetime, () => controller.Lifetime);
TryUpdateTask(ref activeServerReboot, () => controller.OnReboot);
TryUpdateTask(ref serverPrimed, () => controller.OnPrime);
}
else
{
@@ -825,8 +848,17 @@ namespace Tgstation.Server.Host.Components.Watchdog
lastController = controller;
}
TryUpdateTask(ref activeLaunchParametersChanged, ActiveParametersUpdated.Task);
TryUpdateTask(ref newDmbAvailable, DmbFactory.OnNewerDmb);
TryUpdateTask(ref activeLaunchParametersChanged, () => ActiveParametersUpdated.Task);
TryUpdateTask(
ref newDmbAvailable,
() =>
{
var result = ranInitialDmbCheck
? DmbFactory.OnNewerDmb
: InitialCheckDmbUpdated(controller.CompileJob);
ranInitialDmbCheck = true;
return result;
});
}
UpdateMonitoredTasks();