cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-26 22:48:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #442 from tgstation/437-HandleDeadOnArrival

Browse Source 
Fix watchdog crashing if DreamDaemon immediately exits
This commit is contained in:
Jordan Brown
2017-12-06 13:02:50 -05:00
committed by GitHub
parent e0db57c740 c7a1cfa719
commit 17020d3209
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGS.Server/Instance/DreamDaemon.cs
+7 -3
View File
@@ -346,8 +346,12 @@ namespace TGS.Server
CurrentDDLog = DateTime.UtcNow.ToString("yyyy-MM-ddTHH-mm-ssZ");
WriteCurrentDDLog("Starting monitoring...");
}
pcpu = new PerformanceCounter("Process", "% Processor Time", Proc.ProcessName, true);
MemTrackTimer.Start();
try
{
pcpu = new PerformanceCounter("Process", "% Processor Time", Proc.ProcessName, true);
MemTrackTimer.Start();
}
catch (InvalidOperationException) { /*process already exited*/ }
try
{
Proc.WaitForExit();
@@ -357,7 +361,7 @@ namespace TGS.Server
lock (watchdogLock) //synchronize
{
MemTrackTimer.Stop();
pcpu.Dispose();
pcpu?.Dispose();
}
}