From 2cab2cfe4eeebccb50c9261106490928d12b88ed Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Sun, 24 Sep 2017 08:36:58 -0400 Subject: [PATCH 1/3] Improves service upgrade messages --- TGInstallerWrapper/Main.cs | 1 + TGServerService/DreamDaemon.cs | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/TGInstallerWrapper/Main.cs b/TGInstallerWrapper/Main.cs index c4ff509e59..350c8c1df8 100644 --- a/TGInstallerWrapper/Main.cs +++ b/TGInstallerWrapper/Main.cs @@ -114,6 +114,7 @@ namespace TGInstallerWrapper try { Server.GetComponent().PrepareForUpdate(); + Thread.Sleep(3000); //chat messages } catch { diff --git a/TGServerService/DreamDaemon.cs b/TGServerService/DreamDaemon.cs index 91db552c39..ee6abe4e0b 100644 --- a/TGServerService/DreamDaemon.cs +++ b/TGServerService/DreamDaemon.cs @@ -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 From 35df339a05447fe2093475bf25420780254c4811 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Sun, 24 Sep 2017 08:37:25 -0400 Subject: [PATCH 2/3] Tabs --- TGServerService/DreamDaemon.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/TGServerService/DreamDaemon.cs b/TGServerService/DreamDaemon.cs index ee6abe4e0b..5bb4037634 100644 --- a/TGServerService/DreamDaemon.cs +++ b/TGServerService/DreamDaemon.cs @@ -46,11 +46,11 @@ namespace TGServerService if (Proc == null) throw new Exception("GetProcessById returned null!"); TGServerService.WriteInfo("Reattached to running DD process!", TGServerService.EventID.DDReattachSuccess); - ThreadPool.QueueUserWorkItem(_ => - { - Thread.Sleep(5000); - 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; From dc0bd94e1f9ead8b3fbd093c4a76e32deed69002 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Sun, 24 Sep 2017 08:38:05 -0400 Subject: [PATCH 3/3] Tabs --- TGInstallerWrapper/Main.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TGInstallerWrapper/Main.cs b/TGInstallerWrapper/Main.cs index 350c8c1df8..62b52e94a7 100644 --- a/TGInstallerWrapper/Main.cs +++ b/TGInstallerWrapper/Main.cs @@ -114,7 +114,7 @@ namespace TGInstallerWrapper try { Server.GetComponent().PrepareForUpdate(); - Thread.Sleep(3000); //chat messages + Thread.Sleep(3000); //chat messages } catch {