From 26938c3afa4c0e4ea4dc9ba441400659956b0183 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 5 May 2020 01:03:12 -0400 Subject: [PATCH] Fix setting reboot states --- .../Components/Watchdog/SessionController.cs | 2 +- src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs b/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs index 3e2b0b4abc..d46052b450 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs @@ -593,7 +593,7 @@ namespace Tgstation.Server.Host.Components.Watchdog cancellationToken) .ConfigureAwait(false); - return result != null && result.ErrorMessage != null; + return result != null && result.ErrorMessage == null; } /// diff --git a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs index 5600944819..703a6b3b05 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs @@ -512,7 +512,7 @@ namespace Tgstation.Server.Host.Components.Watchdog return; var toClear = GetActiveController(); if (toClear != null) - toClear.ResetRebootState(); + await toClear.SetRebootState(Watchdog.RebootState.Normal, cancellationToken).ConfigureAwait(false); } }