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

Fixes double messages for hard restarts

Browse Source
This commit is contained in:
Jordan Brown
2017-10-12 13:00:21 -04:00
committed by GitHub
parent 5c0f867882
commit 18b54ae2dd
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGServerService/DreamDaemon.cs
+8 -13
View File
@@ -189,21 +189,16 @@ 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);
RestartInProgress = true;
Stop();
var res = Start();
return res;
}
finally
{
RestartInProgress = false;
Monitor.Exit(restartLock);
if (RestartInProgress)
return "Restart already in progress";
}
SendMessage("DD: Hard restart triggered", ChatMessageType.WatchdogInfo);
RestartInProgress = true;
Stop();
var res = Start();
return res;
}
//loop that keeps the server running