From 5b60abeb513b0e0c398eb3a4be1f016ce61b8466 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Thu, 19 Jul 2018 15:51:47 -0400 Subject: [PATCH] Dispose useless inactive server sooner --- .../Components/Watchdog/Watchdog.cs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs index 9d060f4063..9dc9559905 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs @@ -360,17 +360,16 @@ namespace Tgstation.Server.Host.Components.Watchdog case MonitorActivationReason.ActiveLaunchParametersUpdated: //replace the notification tcs here so that the next loop will read a fresh one activeParametersUpdated = new TaskCompletionSource(); + monitorState.InactiveServer.Dispose(); //kill or recycle it + monitorState.NextAction = MonitorAction.Continue; - using (monitorState.InactiveServer) //it's dead, dispose it when we're done + var usedLatestDmb = await RestartInactiveServer().ConfigureAwait(false); + + if (monitorState.NextAction == MonitorAction.Continue) { - monitorState.NextAction = MonitorAction.Continue; - var usedLatestDmb = await RestartInactiveServer().ConfigureAwait(false); - if (monitorState.NextAction == MonitorAction.Continue) - { - monitorState.ActiveServer.ClosePortOnReboot = false; - if (monitorState.InactiveServerHasStagedDmb && !usedLatestDmb) - monitorState.InactiveServerHasStagedDmb = false; //don't try to load it again though - } + monitorState.ActiveServer.ClosePortOnReboot = false; + if (monitorState.InactiveServerHasStagedDmb && !usedLatestDmb) + monitorState.InactiveServerHasStagedDmb = false; //don't try to load it again though } break; case MonitorActivationReason.ActiveServerRebooted: