From c66e0907dcfc0fc91b4673dbb97007e5c22c88c1 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 21 Sep 2022 10:02:27 -0400 Subject: [PATCH] Simplify watchdog DisposeAsync --- src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs index 99db90ad26..e81c3b1145 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs @@ -244,9 +244,7 @@ namespace Tgstation.Server.Host.Components.Watchdog synchronizationSemaphore.Dispose(); restartRegistration.Dispose(); - // DCT: None available, Operation must always run - releaseServers = false; // Server release should have been handled in StopAsync, this causes a DB access that can create ObjectDisposedExceptions - await DisposeAndNullControllers(default); + await DisposeAndNullControllersImpl(); controllerDisposeSemaphore.Dispose(); monitorCts?.Dispose(); disposed = true;