From f4a4e0868faf6f608b08c61de533b25c71154332 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 19 Nov 2023 17:15:37 -0500 Subject: [PATCH] Correct overzealous watchdog restarts --- .../Components/Watchdog/BasicWatchdog.cs | 6 +----- src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Watchdog/BasicWatchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/BasicWatchdog.cs index ee110646fa..7483760afb 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/BasicWatchdog.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/BasicWatchdog.cs @@ -289,11 +289,7 @@ namespace Tgstation.Server.Host.Components.Watchdog /// The for the operation. /// A resulting in the to take. protected virtual ValueTask HandleNormalReboot(CancellationToken cancellationToken) - { - var settingsUpdatePending = ActiveLaunchParameters != LastLaunchParameters; - var result = settingsUpdatePending ? MonitorAction.Restart : MonitorAction.Continue; - return ValueTask.FromResult(result); - } + => ValueTask.FromResult(MonitorAction.Continue); /// /// Handler for . diff --git a/src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs index 2d8d0f5d24..39600383f3 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs @@ -37,6 +37,7 @@ namespace Tgstation.Server.Host.Components.Watchdog /// /// The the active server is using. /// + /// This may not be the exact same as but still be associated with the same session. DreamDaemonLaunchParameters LastLaunchParameters { get; } ///