serverwatcher 4.5.1__tar.gz → 4.6__tar.gz

{serverwatcher-4.5.1/src/serverwatcher.egg-info → serverwatcher-4.6}/PKG-INFO

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

{serverwatcher-4.5.1 → serverwatcher-4.6}/pyproject.toml

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

{serverwatcher-4.5.1 → serverwatcher-4.6}/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.5.1 → serverwatcher-4.6}/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.1 → serverwatcher-4.6}/src/serverwatcher/validator.py

@@ -88,32 +88,29 @@ def validate_messages_config(cfg, errors):
             # Not required for every field, but warn if missing
             pass
 
-def ensure_no_global_defaults(cfg, errors):
+def ensure_no_global_defaults(cfg, defaults):
     if cfg.panel_url == "https://example.com":
-        errors.append('panel_url: must not be left default')
+        defaults.append('panel_url')
     
     if cfg.panel_api_key == 'CHANGE_ME':
-        errors.append('panel_api_key: must not be left default')
+        defaults.append('panel_api_key')
 
     if cfg.origin_server_id == 'CHANGE_ME':
-        errors.append('origin_server_id: must not be left default')
+        defaults.append('origin_server_id')
 
     if cfg.server_id == 'CHANGE_ME':
-        errors.append('server_id: must not be left default')
+        defaults.append('server_id')
 
     if cfg.server_domain == 'mc.example.com':
-        errors.append('server_domain: must not be left default')
+        defaults.append('server_domain')
 
     if cfg.rcon_password == 'password':
-        errors.append('rcon_password: must not be left default')
+        defaults.append('rcon_password')
 
 
-def ensure_no_watcher_defaults(cfg, errors):
-    if cfg.restart_soon_schedule_id <= 0:
-        errors.append(f'restart_soon_schedule_id: must be >= 1 (got {cfg.restart_soon_schedule_id})')
-
-    if cfg.origin_disable_schedule_id <= 0:
-        errors.append(f'origin_disable_schedule_id: must be >= 1 (got {cfg.origin_disable_schedule_id})')
+def ensure_no_watcher_defaults(cfg, defaults):
+    if cfg.schedule_control and cfg.restart_soon_id == 0:
+        defaults.append('restart_soon_id')
 
 
 # -----------------------------
@@ -122,6 +119,7 @@ def ensure_no_watcher_defaults(cfg, errors):
 
 def validate_all():
     errors = []
+    defaults = []
 
     # Load configs
     global_cfg = loadConfig("config/global.yaml", "/defaultconfigs/global.yaml", GlobalConfig)
@@ -139,15 +137,23 @@ def validate_all():
     validate_watcher_config(watcher_cfg, errors)
 
     # Check for defaults
-    ensure_no_global_defaults(global_cfg, errors)
-    ensure_no_watcher_defaults(watcher_cfg, errors)
+    ensure_no_global_defaults(global_cfg, defaults)
+    ensure_no_watcher_defaults(watcher_cfg, defaults)
 
 
     # Print results
-    if errors:
+    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)
+        sys.exit(1)
+
+    if errors or defaults:
         print("❌ CONFIG VALIDATION FAILED:")
         for e in errors:
             print(" -", e)
+        for d in defaults:
+            print(" -", d, ": must not be left default")
         sys.exit(1)
 
     print("✅ All configs are valid.")

{serverwatcher-4.5.1 → serverwatcher-4.6}/src/serverwatcher/watcher.py

@@ -92,7 +92,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)
@@ -107,7 +108,6 @@ 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)
         else:
             self.log.error(self.messages.server_failed_restart)
 
@@ -166,7 +166,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
 

{serverwatcher-4.5.1 → serverwatcher-4.6/src/serverwatcher.egg-info}/PKG-INFO

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