Removed debug console output entries. Moved ConfigLoader and Updater …

…calls to BedrockServiceWrapper to avoid being called while passing commands to to TopShelf.
crowbarmaster · Dec 27, 2020 · e2c7ee2 · e2c7ee2
1 parent 08fecc9
commit e2c7ee2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/BedrockService/BedrockServerWrapper.cs b/BedrockService/BedrockServerWrapper.cs
@@ -161,7 +161,6 @@ private void WCFThread()
         {
             try
             {
-                Console.WriteLine("Starting WCF server");
 
                 wcfConsoleServer = new WCFConsoleServer(process, GetCurrentConsole, ServerConfig.WCFPortNumber);
                 _log.Debug("Before process.WaitForExit()");
@@ -196,7 +195,7 @@ private bool MonitoredAppExists(string monitoredAppName)
             }
             catch (Exception ex)
             {
-                Debug.WriteLine("ApplicationWatcher MonitoredAppExists Exception: " + ex.StackTrace);
+                Console.WriteLine("ApplicationWatcher MonitoredAppExists Exception: " + ex.StackTrace);
                 return true;
             }
         }

diff --git a/BedrockService/BedrockServiceWrapper.cs b/BedrockService/BedrockServiceWrapper.cs
@@ -43,6 +43,7 @@ public class BedrockServiceWrapper : ServiceControl
 
         public BedrockServiceWrapper(bool throwOnStart, bool throwOnStop, bool throwUnhandled)
         {
+            LoadInit();
             try
             {
                 string pattern = @"^Service_(.*)$";
@@ -71,7 +72,6 @@ public BedrockServiceWrapper(bool throwOnStart, bool throwOnStop, bool throwUnha
                             config.ShortName = TestMatch.Groups[1].Value;
                         }
                         bedrockServers.Add(new BedrockServerWrapper(config));
-                        Console.WriteLine("Added config!");
                     }
                 }
 
@@ -211,7 +211,6 @@ public bool Start(HostControl hostControl)
                     brs.Stopping = false;
                     brs.StartControl(hostControl);
                     Thread.Sleep(2000);
-                    Console.WriteLine($"AppName was: {brs.ServerConfig.BedrockServerExeName.Substring(0, brs.ServerConfig.BedrockServerExeName.Length - 4)}");
                 }
                 return true;
             }
@@ -244,7 +243,6 @@ private void ValidSettingsCheck()
                             File.Delete(server.ServerConfig.BedrockServerExeLocation + server.ServerConfig.BedrockServerExeName);
                         }
                         File.Copy(server.ServerConfig.BedrockServerExeLocation + "bedrock_server.exe", server.ServerConfig.BedrockServerExeLocation + server.ServerConfig.BedrockServerExeName);
-                        Console.WriteLine($@"Copied {server.ServerConfig.BedrockServerExeLocation + "bedrock_server.exe"} to {server.ServerConfig.BedrockServerExeLocation + server.ServerConfig.BedrockServerExeName}");
                     }
                     if (!File.Exists(server.ServerConfig.BedrockServerExeLocation + server.ServerConfig.BedrockServerExeName))
                     {
@@ -437,7 +435,7 @@ public string[] WriteJSONFiles(string ShortName)
             }
             sb.Remove(sb.Length - 2, 2);
             sb.Append("\n]");
-            Console.WriteLine($"JSON Output was: {sb}");
+
             output[0] = sb.ToString();
             sb = new StringBuilder();
             sb.Append("[\n");
@@ -450,9 +448,15 @@ public string[] WriteJSONFiles(string ShortName)
             }
             sb.Remove(sb.Length - 2, 2);
             sb.Append("\n]");
-            Console.WriteLine($"JSON Output was: {sb}");
+
             output[1] = sb.ToString();
             return output;
         }
+
+        private void LoadInit()
+        {
+            ConfigLoader.LoadConfigs();
+            Updater.CheckUpdates().Wait();
+        }
     }
 }
diff --git a/BedrockService/Program.cs b/BedrockService/Program.cs
@@ -1,8 +1,5 @@
 using log4net.Config;
 using System;
-using System.IO;
-using System.Text;
-using System.Threading;
 using Topshelf;
 
 namespace BedrockService
@@ -14,8 +11,6 @@ static void Main(string[] args)
         {
 
             XmlConfigurator.Configure();
-            ConfigLoader.LoadConfigs();
-            Updater.CheckUpdates().Wait();
 
             var rc = HostFactory.Run(x =>
             {
@@ -28,8 +23,8 @@ static void Main(string[] args)
                 bool throwUnhandled = false;
                 x.Service(settings => new BedrockServiceWrapper(throwOnStart, throwOnStop, throwUnhandled), s =>
                 {
-                    s.BeforeStartingService(_ => Console.WriteLine("BeforeStart"));
-                    s.BeforeStoppingService(_ => Console.WriteLine("BeforeStop"));
+                    s.BeforeStartingService(_ => Console.WriteLine("Starting service..."));
+                    s.BeforeStoppingService(_ => Console.WriteLine("Stopping service..."));
 
                 });
 
@@ -41,7 +36,6 @@ static void Main(string[] args)
 
                 x.EnableServiceRecovery(src =>
                 {
-                    src.OnCrashOnly();
                     src.RestartService(delayInMinutes: 0);
                     src.RestartService(delayInMinutes: 1);
                     src.SetResetPeriod(days: 1);