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

Improve monitor crash handling

Browse Source 
- Fix Status never getting set to DelayedRestart
This commit is contained in:
Jordan Brown
2020-07-06 12:32:14 -04:00
parent 4454c88ab3
commit 0be37fb6b4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
+6 -2
View File
@@ -559,6 +559,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
}
Logger.LogWarning("Failed to automatically restart the watchdog! Attempt: {0}, Exception: {1}", retryAttempts, launchException);
Status = WatchdogStatus.DelayedRestart;
var retryDelay = Math.Min(
Convert.ToInt32(
@@ -702,7 +703,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
e);
var nextActionMessage = nextAction != MonitorAction.Exit
? "Restarting"
? "Recovering"
: "Shutting down";
var chatTask = Chat.SendWatchdogMessage(
$"Monitor crashed, this should NEVER happen! Please report this, full details in logs! {nextActionMessage}. Error: {e.Message}",
@@ -713,7 +714,10 @@ namespace Tgstation.Server.Host.Components.Watchdog
nextAction = MonitorAction.Exit;
else if (nextAction != MonitorAction.Exit)
{
await MonitorRestart(cancellationToken).ConfigureAwait(false);
if (GetActiveController()?.Lifetime.IsCompleted != true)
await MonitorRestart(cancellationToken).ConfigureAwait(false);
else
Logger.LogDebug("Server seems to be okay, not restarting");
nextAction = MonitorAction.Continue;
}