From 08aed5d904938ca1489d1180c8b6e748ea44d13e Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 16 Sep 2018 13:40:50 -0400 Subject: [PATCH 1/2] Remove redundant call to StopMonitor() --- src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs index bbd159f5a4..6507c386f1 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs @@ -713,7 +713,6 @@ namespace Tgstation.Server.Host.Components.Watchdog if (startMonitor) { - await StopMonitor().ConfigureAwait(false); monitorCts = new CancellationTokenSource(); monitorTask = MonitorLifetimes(monitorCts.Token); } From f91fc8e982d0313a34267258db7b18ceeba04f5f Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 16 Sep 2018 13:41:26 -0400 Subject: [PATCH 2/2] Clear LastLaunchParameters on Watchdog termination --- src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs index 6507c386f1..0a852be342 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs @@ -215,6 +215,7 @@ namespace Tgstation.Server.Host.Components.Watchdog var chatTask = announce ? chat.SendWatchdogMessage("Terminating...", cancellationToken) : Task.CompletedTask; await StopMonitor().ConfigureAwait(false); DisposeAndNullControllers(); + LastLaunchParameters = null; await chatTask.ConfigureAwait(false); return; }