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

Fix some watchdog issues

Browse Source
This commit is contained in:
Jordan Brown
2018-09-22 19:24:59 -04:00
parent c828c5f637
commit fed4b92675
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/DMAPI/tgs/v4/api.dm
+2 -3
View File
@@ -222,14 +222,13 @@
export_lock = FALSE
/datum/tgs_api/v4/OnReboot()
var/json = Export(TGS4_COMM_WORLD_REBOOT)
var/list/result = json_decode(json)
var/list/result = Export(TGS4_COMM_WORLD_REBOOT)
if(!result)
return
//okay so the standard TGS4 proceedure is: right before rebooting change the port to whatever was sent to us in the above json's data parameter
var/port = json[TGS4_PARAMETER_DATA]
var/port = result[TGS4_PARAMETER_DATA]
if(!isnum(port))
return //this is valid, server may just want use to reboot
src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs
+3 -1
View File
@@ -713,9 +713,11 @@ namespace Tgstation.Server.Host.Components.Watchdog
await Task.WhenAny(allTask, cancelTcs.Task).ConfigureAwait(false);
cancellationToken.ThrowIfCancellationRequested();
//both servers are now running, alpha is the active server, huzzah
//both servers are now running, alpha is the active server(unless reattach), huzzah
AlphaIsActive = doReattach ? reattachInfo?.AlphaIsActive ?? true : true;
LastLaunchResult = alphaLrt.Result;
(AlphaIsActive ? alphaServer : bravoServer).ClosePortOnReboot = true;
logger.LogInformation("Launched servers successfully");
Running = true;