1.2.2

Add MA logging ([date]-MA_output_log.txt) Game logs iwll now be this format: [date]-SPC_output_log.txt Better config reload handeling. All server restarts will now be soft (multiadmin wont restart). MemoryChecker was checking memory wrong way around (code was taken from localadmin so ???), it will now work as intended. TitleBar will now show the PID.
ServerMod · Feb 10, 2018 · 0a7a291 · 0a7a291
1 parent 0c00644
commit 0a7a291
Show file tree

Hide file tree

Showing 20 changed files with 122 additions and 25 deletions.
diff --git a/mutliadmin/.vs/MultiAdmin/v15/Server/sqlite3/storage.ide b/mutliadmin/.vs/MultiAdmin/v15/Server/sqlite3/storage.ide
diff --git a/mutliadmin/MultiAdmin/Config.cs b/mutliadmin/MultiAdmin/Config.cs
@@ -10,7 +10,14 @@ namespace MultiAdmin
     public class Config
     {
         public Dictionary<String, String> values;
+        private String config_file;
         public Config(String config_file)
+        {
+            this.config_file = config_file;
+            Reload();
+        }
+
+        public void Reload()
         {
             values = new Dictionary<string, string>();
             var multi_line_value = false;

diff --git a/mutliadmin/MultiAdmin/Feature.cs b/mutliadmin/MultiAdmin/Feature.cs
@@ -15,6 +15,7 @@ public Feature(Server server)
         }
 
         public abstract String GetFeatureDescription();
+        public abstract void OnConfigReload();
         public abstract String GetFeatureName();
         public abstract void Init();
 

diff --git a/mutliadmin/MultiAdmin/Features/Autoscale.cs b/mutliadmin/MultiAdmin/Features/Autoscale.cs
@@ -15,6 +15,10 @@ public Autoscale(Server server) : base(server)
         }
 
         public override void Init()
+        {
+        }
+
+        public override void OnConfigReload()
         {
             config = Server.ServerConfig.GetValue("START_CONFIG_ON_FULL", "disabled");
         }

diff --git a/mutliadmin/MultiAdmin/Features/ChainStart.cs b/mutliadmin/MultiAdmin/Features/ChainStart.cs
@@ -30,6 +30,10 @@ public override string GetFeatureName()
             return "ChainStart";
         }
 
+        public override void OnConfigReload()
+        {
+        }
+
 
         public void OnServerStart()
         {

diff --git a/mutliadmin/MultiAdmin/Features/ConfigReload.cs b/mutliadmin/MultiAdmin/Features/ConfigReload.cs
@@ -50,10 +50,20 @@ public void OnCall(string[] args)
             {
                 Server.SwapConfigs();
                 pass = true;
+                Server.ServerConfig.Reload();
+                Server.Log("Reloading config");
+                foreach (Feature feature in Server.Features)
+                {
+                    feature.OnConfigReload();
+                }
             }
 
         }
 
+        public override void OnConfigReload()
+        {
+        }
+
         public bool PassToGame()
         {
             return pass;

diff --git a/mutliadmin/MultiAdmin/Features/EventTest.cs b/mutliadmin/MultiAdmin/Features/EventTest.cs
@@ -17,6 +17,10 @@ public override void Init()
         {
         }
 
+        public override void OnConfigReload()
+        {
+        }
+
         public override string GetFeatureDescription()
         {
             return "Tests the events";

diff --git a/mutliadmin/MultiAdmin/Features/ExitCommand.cs b/mutliadmin/MultiAdmin/Features/ExitCommand.cs
@@ -19,6 +19,10 @@ public string GetCommand()
             return "EXIT";
         }
 
+        public override void OnConfigReload()
+        {
+        }
+
         public string GetCommandDescription()
         {
             return "Exits the server";
@@ -47,7 +51,6 @@ public override void Init()
         public void OnCall(string[] args)
         {
             Server.StopServer(false);
-
         }
 
         public bool PassToGame()

diff --git a/mutliadmin/MultiAdmin/Features/GithubGenerator.cs b/mutliadmin/MultiAdmin/Features/GithubGenerator.cs
@@ -13,6 +13,10 @@ public GithubGenerator(Server server) : base(server)
         {
         }
 
+        public override void OnConfigReload()
+        {
+        }
+
         public string GetCommand()
         {
             return "GITHUBGEN";

diff --git a/mutliadmin/MultiAdmin/Features/HelpCommand.cs b/mutliadmin/MultiAdmin/Features/HelpCommand.cs
@@ -17,6 +17,10 @@ public string GetCommand()
             return "HELP";
         }
 
+        public override void OnConfigReload()
+        {
+        }
+
         public string GetCommandDescription()
         {
             return "Prints out available commands and their function.";

diff --git a/mutliadmin/MultiAdmin/Features/InactivityShutdown.cs b/mutliadmin/MultiAdmin/Features/InactivityShutdown.cs
@@ -18,10 +18,14 @@ public InactivityShutdown(Server server) : base(server)
 
         public override void Init()
         {
-            waitFor = Server.ServerConfig.GetIntValue("SHUTDOWN_ONCE_EMPTY_FOR", -1);
             roundEndTime = Utils.GetUnixTime();
         }
 
+        public override void OnConfigReload()
+        {
+            waitFor = Server.ServerConfig.GetIntValue("SHUTDOWN_ONCE_EMPTY_FOR", -1);
+        }
+
         public void OnRoundEnd()
         {
             roundEndTime = Utils.GetUnixTime();

diff --git a/mutliadmin/MultiAdmin/Features/MemoryChecker.cs b/mutliadmin/MultiAdmin/Features/MemoryChecker.cs
@@ -16,7 +16,6 @@ public MemoryChecker(Server server) : base(server)
 
         public override void Init()
         {
-            lowMb = Server.ServerConfig.GetIntValue("RESTART_LOW_MEMORY", 400);
             tickCount = 0;
         }
 
@@ -32,22 +31,31 @@ public override string GetFeatureName()
 
         public void OnTick()
         {
-            long workingMemory = Server.GetGameProccess().WorkingSet64 / 1048576L;
-            Boolean runningFor3Mins = (Server.GetGameProccess().StartTime.AddMinutes(3.0) < DateTime.Now);
-            if (workingMemory < lowMb && runningFor3Mins)
+            Server.GetGameProccess().Refresh();
+            long workingMemory = Server.GetGameProccess().WorkingSet64 / 1048576L; // process memory in MB
+            long memoryLeft = 2048 - workingMemory; // 32 bit limited to 2GB
+
+            if (memoryLeft < lowMb)
             {
+                Server.Write("Warning: program is running low on memory (" + memoryLeft + " MB left)");
                 tickCount++;
             }
             else
             {
                 tickCount = 0;
             }
 
-            if (tickCount == 5)
+            if (tickCount == 10)
             {
-                Server.RestartServer();
+                Server.Write("Restarting due to lower memory");
+                Server.SoftRestartServer();
             }
 
         }
+
+        public override void OnConfigReload()
+        {
+            lowMb = Server.ServerConfig.GetIntValue("RESTART_LOW_MEMORY", 400);
+        }
     }
 }
diff --git a/mutliadmin/MultiAdmin/Features/MultiAdminInfo.cs b/mutliadmin/MultiAdmin/Features/MultiAdminInfo.cs
@@ -18,6 +18,10 @@ public override void Init()
         {
         }
 
+        public override void OnConfigReload()
+        { 
+        }
+
         public void PrintInfo()
         {
             Server.Write("MultiAdmin for SCP: Secret Laboratory made by Courtney (Grover_c13), who is not a girl.", ConsoleColor.DarkMagenta);

diff --git a/mutliadmin/MultiAdmin/Features/NewCommand.cs b/mutliadmin/MultiAdmin/Features/NewCommand.cs
@@ -15,6 +15,10 @@ public NewCommand(Server server) : base(server)
         }
 
         public override void Init()
+        {
+        }
+
+        public override void OnConfigReload()
         {
             config = Server.ServerConfig.GetValue("START_CONFIG_ON_FULL", "disabled");
         }

diff --git a/mutliadmin/MultiAdmin/Features/RestartNextRound.cs b/mutliadmin/MultiAdmin/Features/RestartNextRound.cs
@@ -24,6 +24,7 @@ public string GetCommandDescription()
             return "Restarts the server at the end of this round";
         }
 
+
         public void OnCall(string[] args)
         {
             Server.Write("Server will restart next round");
@@ -32,7 +33,7 @@ public void OnCall(string[] args)
 
         public void OnRoundEnd()
         {
-            if (restart) base.Server.RestartServer();
+            if (restart) base.Server.SoftRestartServer();
         }
 
         public bool PassToGame()
@@ -64,5 +65,9 @@ public string GetUsage()
         {
             return "";
         }
+
+        public override void OnConfigReload()
+        {
+        }
     }
 }
diff --git a/mutliadmin/MultiAdmin/Features/RestartRoundCounter.cs b/mutliadmin/MultiAdmin/Features/RestartRoundCounter.cs
@@ -18,14 +18,18 @@ public RestartRoundCounter(Server server) : base(server)
         public override void Init()
         {
             count = 0;
+        }
+
+        public override void OnConfigReload()
+        {
             restartAfter = Server.ServerConfig.GetIntValue("RESTART_EVERY_NUM_ROUNDS", -1);
         }
 
         public void OnRoundEnd()
         {
             if (restartAfter < 0) return;
             count++; 
-            if (count > restartAfter) base.Server.RestartServer();
+            if (count > restartAfter) base.Server.SoftRestartServer();
         }
 
 

diff --git a/mutliadmin/MultiAdmin/Features/StopNextRound.cs b/mutliadmin/MultiAdmin/Features/StopNextRound.cs
@@ -25,6 +25,11 @@ public override void Init()
             stop = false;
         }
 
+
+        public override void OnConfigReload()
+        {
+        }
+
         public void OnCall(string[] args)
         {
             stop = true;

diff --git a/mutliadmin/MultiAdmin/Features/TitleBar.cs b/mutliadmin/MultiAdmin/Features/TitleBar.cs
@@ -33,6 +33,10 @@ public override void Init()
             UpdateTitlebar();
         }
 
+        public override void OnConfigReload()
+        {
+        }
+
         public void OnPlayerConnect(String name)
         {
             playerCount++;
@@ -59,7 +63,8 @@ public void UpdateTitlebar()
             }
             var displayPlayerCount = playerCount;
             if (playerCount == -1) displayPlayerCount = 0;
-            Console.Title = "SCP:SL MultiAdmin " + Server.MA_VERSION + " | Config: " + Server.ConfigKey + " | Session ID:" + Server.GetSessionId() + " | " + displayPlayerCount + "/" + maxPlayers + " | " + smod;
+            string proccessId = (Server.GetGameProccess() == null) ? "" : Server.GetGameProccess().Id.ToString();
+            Console.Title = "SCP:SL MultiAdmin " + Server.MA_VERSION + " | Config: " + Server.ConfigKey + " | Session ID:" + Server.GetSessionId() + " Game PID: " + proccessId+ " | " + displayPlayerCount + "/" + maxPlayers + " | " + smod;
         }
     }
 }
diff --git a/mutliadmin/MultiAdmin/OutputThread.cs b/mutliadmin/MultiAdmin/OutputThread.cs
@@ -19,8 +19,6 @@ public static void Read(Server server)
                 catch
                 {
                     server.Write("Message printer warning: 'SCPSL_Data/Dedicated' directory not found.", ConsoleColor.Yellow);
-                    server.Write("Press any key to ignore...", ConsoleColor.DarkGray);
-                    Console.ReadKey();
                 }
 
                 foreach (string path in strArray)
@@ -154,6 +152,7 @@ public static void Read(Server server)
                     if (gameMessage.Contains("Player connect"))
                     {
                         display = false;
+                        server.Log("Player connect event");
                         foreach (Feature f in server.Features)
                         {
                             if (f is IEventPlayerConnect)
@@ -167,6 +166,7 @@ public static void Read(Server server)
                     if (gameMessage.Contains("Player disconnect"))
                     {
                         display = false;
+                        server.Log("Player disconnect event");
                         foreach (Feature f in server.Features)
                         {
                             if (f is IEventPlayerDisconnect)