cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-23 04:57:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add more watchdog trace logging

Browse Source
This commit is contained in:
Jordan Brown
2020-05-22 13:23:36 -04:00
parent 2f5f709a40
commit 78fd044e09
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
+24 -12
View File
@@ -217,6 +217,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
/// <inheritdoc />
public void Dispose()
{
Logger.LogTrace("Disposing...");
Semaphore.Dispose();
restartRegistration.Dispose();
DisposeAndNullControllers();
@@ -558,6 +559,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
private async Task MonitorLifetimes(CancellationToken cancellationToken)
{
Logger.LogTrace("Entered MonitorLifetimes");
using var _ = cancellationToken.Register(() => Logger.LogTrace("Monitor cancellationToken triggered"));
// this function is responsible for calling HandlerMonitorWakeup when necessary and manitaining the MonitorState
var iteration = 1;
@@ -607,6 +609,8 @@ namespace Tgstation.Server.Host.Components.Watchdog
cancellationToken.ThrowIfCancellationRequested();
}
Logger.LogTrace("Monitor activated");
using (await SemaphoreSlimContext.Lock(Semaphore, cancellationToken).ConfigureAwait(false))
{
// always run HandleMonitorWakeup from the context of the semaphore lock
@@ -631,24 +635,32 @@ namespace Tgstation.Server.Host.Components.Watchdog
return false;
}
if (CheckActivationReason(ref activeServerLifetime, MonitorActivationReason.ActiveServerCrashed)
var anyActivation = CheckActivationReason(ref activeServerLifetime, MonitorActivationReason.ActiveServerCrashed)
|| CheckActivationReason(ref activeServerReboot, MonitorActivationReason.ActiveServerRebooted)
|| CheckActivationReason(ref newDmbAvailable, MonitorActivationReason.NewDmbAvailable)
|| CheckActivationReason(ref inactiveServerLifetime, MonitorActivationReason.InactiveServerCrashed)
|| CheckActivationReason(ref inactiveServerReboot, MonitorActivationReason.InactiveServerRebooted)
|| CheckActivationReason(ref inactiveStartupComplete, MonitorActivationReason.InactiveServerStartupComplete)
|| CheckActivationReason(ref activeLaunchParametersChanged, MonitorActivationReason.ActiveLaunchParametersUpdated))
{
Logger.LogTrace("Monitor activation: {0}", activationReason);
await HandleMonitorWakeup(activationReason, monitorState, cancellationToken).ConfigureAwait(false);
}
else if (CheckActivationReason(ref heartbeat, MonitorActivationReason.Heartbeat))
{
Logger.LogTrace("Monitor activation: {0}", activationReason);
monitorState.NextAction = await HandleHeartbeat(monitorState.ActiveServer, cancellationToken).ConfigureAwait(false);
}
else
|| CheckActivationReason(ref activeLaunchParametersChanged, MonitorActivationReason.ActiveLaunchParametersUpdated)
|| CheckActivationReason(ref heartbeat, MonitorActivationReason.Heartbeat);
if (!anyActivation)
moreActivationsToProcess = false;
else
{
Logger.LogTrace("Reason: {0}", activationReason);
if (activationReason == MonitorActivationReason.Heartbeat)
monitorState.NextAction = await HandleHeartbeat(
monitorState.ActiveServer,
cancellationToken)
.ConfigureAwait(false);
else
await HandleMonitorWakeup(
activationReason,
monitorState,
cancellationToken)
.ConfigureAwait(false);
}
}
}