serverwatcher 4.5.2__tar.gz → 4.7__tar.gz

{serverwatcher-4.5.2/src/serverwatcher.egg-info → serverwatcher-4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: serverwatcher
-Version: 4.5.2
+Version: 4.7
 Summary: A HungerLib-powered Minecraft server automation engine.
 Author: iFamished
 License: GPL-3.0

{serverwatcher-4.5.2 → serverwatcher-4.7}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "serverwatcher"
-version = "4.5.2"
+version = "4.7"
 description = "A HungerLib-powered Minecraft server automation engine."
 readme = "README.md"
 requires-python = ">=3.10"

{serverwatcher-4.5.2 → serverwatcher-4.7}/src/serverwatcher/configclasses/messages.py

@@ -40,6 +40,9 @@ class MessagesConfig:
     log_gap_high: str
 
     # reasons
+    pro_restart_splash: str
+    anti_restart_splash: str
+
     reason_restart_soon: str
     reason_ram: str
     reason_cpu: str

{serverwatcher-4.5.2 → serverwatcher-4.7}/src/serverwatcher/configclasses/watcher.py

@@ -2,8 +2,8 @@ from dataclasses import dataclass
 
 @dataclass
 class WatcherConfig:
-    restart_soon_schedule_id: int
-    origin_disable_schedule_id: int
+    schedule_control: bool
+    restart_soon_id: int
 
     ram_threshold: int
     cpu_threshold: int

serverwatcher-4.7/src/serverwatcher/defaultconfigs/global.yaml

@@ -0,0 +1,28 @@
+watch_interval: 300
+
+panel:
+  panel_name: "My Panel"
+  panel_url: "https://example.com"
+  panel_api_key: "CHANGE_ME"
+
+origin:
+  origin_server_id: "CHANGE_ME"
+
+server:
+  server_name: "My SMP"
+  server_id: "CHANGE_ME"
+  server_domain: "mc.example.com"
+  server_port: 25565
+  rcon_port: 25575
+  rcon_password: "password"
+  tps_command: "ticks"
+
+logging:
+  do_logging: True
+  logger_name: "Server Watcher"
+  log_path: "/home/container/logs/"
+  timezone: "America/Chicago"
+
+terminal:
+  console_backspaces: 8
+  clear_terminal: True

{serverwatcher-4.5.2 → serverwatcher-4.7}/src/serverwatcher/defaultconfigs/messages.yaml

@@ -1,4 +1,4 @@
-prefix: "<aqua>[Server Watcher]"
+prefix: "<reset><aqua>[Server Watcher]"
 
 broadcast_restart_at: "{prefix} The server will restart at {time} CDT."
 
@@ -36,6 +36,9 @@ logging:
   log_gap_high: "Gap {gap}. Scheduling restart in 1 hour."
 
 reasons:
+  pro_restart_splash: "PRO-RESTART REASONS:"
+  anti_restart_splash: "ANTI-RESTART REASONS:"
+
   reason_restart_soon: "The server is set to restart soon"
   reason_ram: "RAM usage ({ram}) is higher than {threshold} GB"
   reason_cpu: "CPU usage ({cpu}) is higher than {threshold}%"

{serverwatcher-4.5.2 → serverwatcher-4.7}/src/serverwatcher/defaultconfigs/watcher.yaml

@@ -1,6 +1,6 @@
 schedules:
-  restart_soon_schedule_id: 0     # replace this with real schedule id
-  origin_disable_schedule_id: 0   # replace this with real schedule id
+  schedule_control: False
+  restart_soon_id: 0     # replace this with a real schedule id
 
 thresholds:
   ram_threshold: 6

{serverwatcher-4.5.2 → serverwatcher-4.7}/src/serverwatcher/validator.py

@@ -109,11 +109,8 @@ def ensure_no_global_defaults(cfg, defaults):
 
 
 def ensure_no_watcher_defaults(cfg, defaults):
-    if cfg.restart_soon_schedule_id == 0:
-        defaults.append('restart_soon_schedule_id')
-
-    if cfg.origin_disable_schedule_id == 0:
-        defaults.append('origin_disable_schedule_id')
+    if cfg.schedule_control and cfg.restart_soon_id == 0:
+        defaults.append('restart_soon_id')
 
 
 # -----------------------------
@@ -145,7 +142,7 @@ def validate_all():
 
 
     # Print results
-    if len(defaults) >= 8:
+    if len(defaults) >= 7:
         print("❌ CONFIG VALIDATION FAILED:\nIt looks like you haven't configured this yet! Please change these defaults:")
         for d in defaults:
             print(" -", d)

{serverwatcher-4.5.2 → serverwatcher-4.7}/src/serverwatcher/watcher.py

@@ -18,7 +18,6 @@ from serverwatcher.configclasses.global_config import GlobalConfig
 from serverwatcher.configclasses.messages import MessagesConfig
 from serverwatcher.configclasses.watcher import WatcherConfig
 
-
 from serverwatcher.validator import validate_all
 
 validate_all()
@@ -92,7 +91,8 @@ class ServerWatcher:
 
     # restart logic
     def restart_and_wait(self):
-        self.origin.disableSchedule(self.cfg.restart_soon_schedule_id)
+        if self.cfg.schedule_control:
+            self.origin.disableSchedule(self.cfg.restart_soon_id)
         self.server.restart()
         self.log.info(self.messages.restart_action_sent)
         time.sleep(self.cfg.restart_wait_seconds)
@@ -106,8 +106,7 @@ class ServerWatcher:
 
         if alive:
             self.log.info(self.messages.server_back_online)
-            self.server.sendBroadcast(f"{self.messages.server_back_online_broadcast}")
-            self.origin.enableSchedule(self.cfg.origin_disable_schedule_id)
+            self.log.info(self.fmt(self.messages.server_back_online_broadcast), destination=True, origin=False, logs=False)
         else:
             self.log.error(self.messages.server_failed_restart)
 
@@ -166,7 +165,7 @@ class ServerWatcher:
         no_restart_reasons = []
 
         # pro-restart
-        if self.server.getSchedule(self.cfg.restart_soon_schedule_id)["is_active"]:
+        if self.cfg.schedule_control and self.server.getSchedule(self.cfg.restart_soon_id)["is_active"]:
             restart_reasons.append(self.messages.reason_restart_soon)
             pro += self.cfg.weight_restart_soon
 
@@ -189,7 +188,7 @@ class ServerWatcher:
             )
             pro += self.cfg.weight_uptime
 
-        if snap.tps <= self.cfg.tps_threshold:
+        if (snap.tps if snap.tps is not None else 0) <= self.cfg.tps_threshold:
             restart_reasons.append(
                 self.fmt(self.messages.reason_tps, tps=snap.tps, threshold=self.cfg.tps_threshold)
             )
@@ -211,10 +210,17 @@ class ServerWatcher:
             anti += snap.players * self.cfg.weight_per_player
 
         # logging
-        for r in restart_reasons:
-            self.log.warn(f"- {r}")
-        for r in no_restart_reasons:
-            self.log.warn(f"- {r}")
+        if restart_reasons:
+            self.log.warn(f"{self.messages.pro_restart_splash}")
+            for r in restart_reasons:
+                self.log.warn(f"- {r}")
+            self.log.warn("\n")
+
+        if no_restart_reasons:
+            self.log.warn(f"{self.messages.anti_restart_splash}")
+            for r in no_restart_reasons:
+                self.log.warn(f"- {r}")
+            self.log.warn("\n")
 
         self.log.warn(f"Pro-restart:  {pro}")
         self.log.warn(f"Anti-restart: {anti}")

{serverwatcher-4.5.2 → serverwatcher-4.7/src/serverwatcher.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: serverwatcher
-Version: 4.5.2
+Version: 4.7
 Summary: A HungerLib-powered Minecraft server automation engine.
 Author: iFamished
 License: GPL-3.0

serverwatcher-4.5.2/src/serverwatcher/defaultconfigs/global.yaml

@@ -1,28 +0,0 @@
-watch_interval: 60
-
-panel:
-  panel_name: My Panel
-  panel_url: https://example.com
-  panel_api_key: CHANGE_ME
-
-origin:
-  origin_server_id: CHANGE_ME
-
-server:
-  server_name: My SMP
-  server_id: CHANGE_ME
-  server_domain: mc.example.com
-  server_port: 25565
-  rcon_port: 25575
-  rcon_password: password
-  tps_command: ticks
-
-logging:
-  do_logging: True
-  logger_name: "Server Watcher"
-  log_path: "/home/container/logs/"
-  timezone: "America/Chicago"
-
-terminal:
-  console_backspaces: 8
-  clear_terminal: True