From 0fd5110ebe10f6b577282100a8857dcb19bdf734 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Tue, 23 Oct 2018 15:37:05 -0400 Subject: [PATCH 1/3] Minor code simplification --- .../Components/Watchdog/Watchdog.cs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs index 0302b24fce..a70fddc11f 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs @@ -453,20 +453,13 @@ namespace Tgstation.Server.Host.Components.Watchdog //servers now swapped - //enable this now - monitorState.ActiveServer.ClosePortOnReboot = true; + //enable this now if inactive server is not still valid + monitorState.ActiveServer.ClosePortOnReboot = restartOnceSwapped; if (!restartOnceSwapped) - { - //inactive server still valid - - //disable this - monitorState.InactiveServer.ClosePortOnReboot = false; - //now try to reopen it on the private port //failing that, just reboot it restartOnceSwapped = !await monitorState.InactiveServer.SetPort(ActiveLaunchParameters.SecondaryPort.Value, cancellationToken).ConfigureAwait(false); - } //break either way because any issues past this point would be solved by the reboot if (restartOnceSwapped) From 7fc615b90cdc3003a552bffacb86f07833f8958e Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Tue, 23 Oct 2018 15:41:00 -0400 Subject: [PATCH 2/3] Add additional session controller logging --- .../Components/Watchdog/SessionController.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs b/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs index dd5d2b7ebb..445cf4649a 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs @@ -220,6 +220,8 @@ namespace Tgstation.Server.Host.Components.Watchdog return result; }; LaunchResult = GetLaunchResult(); + + logger.LogDebug("Created session controller. Primary: {0}, CommsKey: {1}, Port: {2}", IsPrimary, reattachInformation.AccessIdentifier, Port); } /// From d15f3f1caaca91a0d044a82321741380d9259dba Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 24 Nov 2018 14:09:41 -0500 Subject: [PATCH 3/3] Fix reattach information port change not happening if port change was instant --- .../Components/Watchdog/SessionController.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs b/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs index 08decc1996..380b18001d 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs @@ -481,6 +481,7 @@ namespace Tgstation.Server.Host.Components.Watchdog return false; } + reattachInformation.Port = port; return true; }