cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-28 15:40:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #256 from tgstation/Cyberboss-patch-1

Browse Source 
Fixes crashes not being written to the resource diagnostics file
This commit is contained in:
Jordan Brown
2017-10-18 10:09:45 -04:00
committed by GitHub
parent 5becfbe4c0 981748b1f1
commit c0ac71ce74
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGServerService/DreamDaemon.cs
+3 -4
View File
@@ -286,7 +286,8 @@ namespace TGServerService
pcpu.Dispose();
}
bool BadStart;
WriteCurrentDDLog("Crash detected!");
lock (watchdogLock)
{
currentStatus = TGDreamDaemonStatus.HardRebooting;
@@ -295,7 +296,7 @@ namespace TGServerService
if (AwaitingShutdown == ShutdownRequestPhase.Pinged)
return;
BadStart = (DateTime.Now - starttime).TotalSeconds < DDBadStartTime;
var BadStart = (DateTime.Now - starttime).TotalSeconds < DDBadStartTime;
if (BadStart)
{
++retries;
@@ -311,8 +312,6 @@ namespace TGServerService
TGServerService.WriteWarning(msg, TGServerService.EventID.DDWatchdogRebootingServer);
}
}
if (BadStart)
WriteCurrentDDLog("Crash detected!");
var res = StartImpl(true);
if (res != null)