cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-25 14:06:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #241 from tgstation/Cyberboss-patch-2

Browse Source 
Fixes double messages for hard restarts
This commit is contained in:
Jordan Brown
2017-10-12 13:04:52 -04:00
committed by GitHub
parent 92ae2443eb 468d1d88e3
commit 338bc14716
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGServerService/DreamDaemon.cs
+12 -12
View File
@@ -189,21 +189,21 @@ namespace TGServerService
{
if (DaemonStatus() == TGDreamDaemonStatus.Offline)
return Start();
if (!Monitor.TryEnter(restartLock))
return "Restart already in progress";
try
lock(restartLock)
{
SendMessage("DD: Hard restart triggered", ChatMessageType.WatchdogInfo);
if (RestartInProgress)
return "Restart already in progress";
RestartInProgress = true;
Stop();
var res = Start();
return res;
}
finally
{
RestartInProgress = false;
Monitor.Exit(restartLock);
}
SendMessage("DD: Hard restart triggered", ChatMessageType.WatchdogInfo);
Stop();
var res = Start();
if(res != null)
lock(restartLock)
{
RestartInProgress = false;
}
return res;
}
//loop that keeps the server running