cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-29 16:11:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove InactiveServerHasStagedDmb from MonitorState

Browse Source 
It was purely informational and we can do better by just logging CompileJob IDs
This commit is contained in:
Cyberboss
2018-09-27 09:36:30 -04:00
parent 5d0c165f92
commit b03648f40e
2 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Watchdog/MonitorState.cs
-5
View File
@@ -12,11 +12,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
/// </summary>
public bool RebootingInactiveServer { get; set; }
/// <summary>
/// If the inactive server has a .dmb and needs to be swapped in
/// </summary>
public bool InactiveServerHasStagedDmb { get; set; }
/// <summary>
/// If the inactive server is in an unrecoverable state
/// </summary>
src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs
+9 -17
View File
@@ -349,16 +349,13 @@ namespace Tgstation.Server.Host.Components.Watchdog
//replace the notification tcs here so that the next loop will read a fresh one
activeParametersUpdated = new TaskCompletionSource<object>();
monitorState.InactiveServer.Dispose(); //kill or recycle it
monitorState.NextAction = breakAfter ? MonitorAction.Break : MonitorAction.Continue;
var desiredNextAction = breakAfter ? MonitorAction.Break : MonitorAction.Continue;
monitorState.NextAction = desiredNextAction;
var usedLatestDmb = await RestartInactiveServer().ConfigureAwait(false);
await RestartInactiveServer().ConfigureAwait(false);
if (monitorState.NextAction == (breakAfter ? MonitorAction.Break : MonitorAction.Continue))
{
if (monitorState.NextAction == desiredNextAction)
monitorState.ActiveServer.ClosePortOnReboot = false;
if (monitorState.InactiveServerHasStagedDmb && !usedLatestDmb)
monitorState.InactiveServerHasStagedDmb = false; //don't try to load it again though
}
};
string ExitWord(ISessionController controller) => controller.TerminationWasRequested ? "exited" : "crashed";
@@ -433,10 +430,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
//are both servers now running the same CompileJob?
var sameCompileJob = monitorState.InactiveServer.Dmb.CompileJob.Id == monitorState.ActiveServer.Dmb.CompileJob.Id;
if (sameCompileJob && monitorState.InactiveServerHasStagedDmb)
//both servers now up to date
monitorState.InactiveServerHasStagedDmb = false;
if (!sameCompileJob || ActiveLaunchParameters != LastLaunchParameters)
//need a new launch to update either settings or compile job
restartOnceSwapped = true;
@@ -499,9 +492,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
monitorState.NextAction = MonitorAction.Continue;
break;
case MonitorActivationReason.NewDmbAvailable:
//set this and then its the same a settings change
monitorState.InactiveServerHasStagedDmb = true;
goto case MonitorActivationReason.ActiveLaunchParametersUpdated;
case MonitorActivationReason.ActiveLaunchParametersUpdated:
//just reload the inactive server and wait for a swap to apply the changes
await UpdateAndRestartInactiveServer(true).ConfigureAwait(false);
@@ -534,9 +524,8 @@ namespace Tgstation.Server.Host.Components.Watchdog
logger.LogDebug("Alpha is the active server");
else
logger.LogDebug("Bravo is the active server");
if (monitorState.InactiveServerHasStagedDmb)
logger.LogDebug("Inactive server has staged .dmb");
if (monitorState.RebootingInactiveServer)
logger.LogDebug("Inactive server is rebooting");
@@ -549,6 +538,9 @@ namespace Tgstation.Server.Host.Components.Watchdog
if (monitorState.InactiveServer.ClosePortOnReboot)
logger.LogDebug("Inactive server will close port on reboot");
logger.LogDebug("Active server Compile Job ID: {0}", monitorState.ActiveServer.Dmb.CompileJob.Id);
logger.LogDebug("Inactive server Compile Job ID: {0}", monitorState.InactiveServer.Dmb.CompileJob.Id);
//load the activation tasks into local variables
var activeServerLifetime = monitorState.ActiveServer.Lifetime;
var inactiveServerLifetime = monitorState.InactiveServer.Lifetime;