cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-24 21:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #206 from Cyberboss/ReattachMessage

Browse Source 
Improves service upgrade messages
This commit is contained in:
Jordan Brown
2017-09-24 09:02:37 -04:00
committed by GitHub
parent 8fb69bee7d dc0bd94e1f
commit 60c4804896
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGInstallerWrapper/Main.cs
+1
View File
@@ -114,6 +114,7 @@ namespace TGInstallerWrapper
try
{
Server.GetComponent<ITGSService>().PrepareForUpdate();
Thread.Sleep(3000); //chat messages
}
catch
{
TGServerService/DreamDaemon.cs
+7 -2
View File
@@ -46,7 +46,11 @@ namespace TGServerService
if (Proc == null)
throw new Exception("GetProcessById returned null!");
TGServerService.WriteInfo("Reattached to running DD process!", TGServerService.EventID.DDReattachSuccess);
SendMessage("DD: Update complete. Watch dog reactivated...", ChatMessageType.WatchdogInfo);
ThreadPool.QueueUserWorkItem(_ =>
{
Thread.Sleep(5000);
SendMessage("DD: Update complete. Watch dog reactivated...", ChatMessageType.WatchdogInfo);
});
//start wd
RestartInProgress = true;
@@ -299,7 +303,8 @@ namespace TGServerService
AwaitingShutdown = ShutdownRequestPhase.None;
if (!RestartInProgress)
{
SendMessage("DD: Server stopped, watchdog exiting...", ChatMessageType.WatchdogInfo);
if(!Properties.Settings.Default.ReattachToDD)
SendMessage("DD: Server stopped, watchdog exiting...", ChatMessageType.WatchdogInfo);
TGServerService.WriteInfo("Watch dog exited", TGServerService.EventID.DDWatchdogExit);
}
else