serverwatcher 5.30.7__tar.gz → 5.31__tar.gz

{serverwatcher-5.30.7/src/serverwatcher.egg-info → serverwatcher-5.31}/PKG-INFO

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

{serverwatcher-5.30.7 → serverwatcher-5.31}/pyproject.toml

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

{serverwatcher-5.30.7 → serverwatcher-5.31}/src/serverwatcher/__main__.py

@@ -14,34 +14,34 @@ def main():
         validate_all()
 
     except FatalError as e:
-        print("❌ FATAL CONFIG ERROR:")
+        print('❌ FATAL CONFIG ERROR:')
         print(e)
         return
 
     except TypeMismatchError as e:
-        print("❌ TYPE MISMATCH ERROR:")
+        print('❌ TYPE MISMATCH ERROR:')
         print(e)
         return
 
     except FallbackError as e:
-        print("⚠️ FALLBACKS IN USE:")
+        print('⚠️ FALLBACKS IN USE:')
         print(e)
-        print("Continuing in 5 seconds...")
+        print('Continuing in 5 seconds...')
         time.sleep(5)
 
     except RecommendedError as e:
-        print("⚠️ RECOMMENDED KEYS MISSING:")
+        print('⚠️ RECOMMENDED KEYS MISSING:')
         print(e)
-        print("Continuing in 5 seconds...")
+        print('Continuing in 5 seconds...')
         time.sleep(5)
 
     except ValidationError as e:
-        print("❌ CONFIG ERROR:")
+        print('❌ CONFIG ERROR:')
         print(e)
         return
 
     watcher = ServerWatcher()
     watcher.run()
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     main()

{serverwatcher-5.30.7 → serverwatcher-5.31}/src/serverwatcher/configclasses/config.py

@@ -5,6 +5,7 @@ class GlobalConfig:
     __user_config_path__ = 'config/config.yaml'
     __default_config_path__ = 'defaultconfigs/config.yaml'
 
+    debug: bool = 'debug'
     timezone: str = 'timezone'
 
     panel_name: str = 'panel.name'
@@ -26,12 +27,14 @@ class GlobalConfig:
     info_prefix: str = 'logger.prefixes.info'
     warn_prefix: str = 'logger.prefixes.warn'
     error_prefix: str = 'logger.prefixes.error'
+    debug_prefix: str = 'logger.prefixes.debug'
 
     clear_terminal: bool = 'terminal.enable_clearing'
     handle_keyboard_interrupt: bool = 'terminal.handle_keyboard_interrupt'
 
 
 class fallbacks:
+    debug = False
     timezone = 'America/Chicago'
 
     panel_name = 'My Panel'
@@ -50,24 +53,25 @@ class fallbacks:
     logger_name = 'Server Watcher'
     log_path = '/home/container/logs/'
 
-    info_prefix = '<white>[INFO]: '
-    warn_prefix = '<yellow>[WARN]: '
-    error_prefix = '<red>[ERROR]: '
+    info_prefix = '<white>[%hh%:%mm%:%ss%] [INFO]: '
+    warn_prefix = '<yellow>[%hh%:%mm%:%ss%] [WARN]: '
+    error_prefix = '<red>[%hh%:%mm%:%ss%] [ERROR]: '
+    debug_prefix = '<aqua>[%hh%:%mm%:%ss%] [DEBUG]: '
 
     clear_terminal = True
     handle_keyboard_interrupt = True
 
 
 class rules:
-    panel_url = "required"
-    panel_api_key = "required"
-    server_id = "required"
-    server_domain = "required"
-    bridge_token = "required"
-
-    timezone = "recommended"
-    panel_name = "recommended"
-    server_port = "recommended"
-    bridge_port = "recommended"
+    panel_url = 'required'
+    panel_api_key = 'required'
+    server_id = 'required'
+    server_domain = 'required'
+    bridge_token = 'required'
+
+    timezone = 'recommended'
+    panel_name = 'recommended'
+    server_port = 'recommended'
+    bridge_port = 'recommended'
 
     # everything else defaults to optional

{serverwatcher-5.30.7 → serverwatcher-5.31}/src/serverwatcher/configclasses/watcher.py

@@ -71,29 +71,29 @@ class fallbacks:
 
 
 class rules:
-    threshold_ram = "required"
-    threshold_cpu = "required"
-    threshold_uptime = "required"
-    threshold_tps = "required"
-
-    restart_wait_seconds = "required"
-    restart_timeout = "required"
-    restart_online_interval = "required"
-
-    watch_interval = "recommended"
-    sample_duration = "recommended"
-    sample_interval = "recommended"
-    sample_outlier_drop = "recommended"
-    threshold_min_uptime = "recommended"
-    threshold_low_gap = "recommended"
-    snap_minutes = "recommended"
-    low_gap_minutes = "recommended"
-    high_gap_minutes = "recommended"
-
-    weight_restart_soon = "optional"
-    weight_ram = "optional"
-    weight_cpu = "optional"
-    weight_uptime = "optional"
-    weight_tps = "optional"
-    weight_low_uptime = "optional"
-    weight_per_player = "optional"
+    threshold_ram = 'required'
+    threshold_cpu = 'required'
+    threshold_uptime = 'required'
+    threshold_tps = 'required'
+
+    restart_wait_seconds = 'required'
+    restart_timeout = 'required'
+    restart_online_interval = 'required'
+
+    watch_interval = 'recommended'
+    sample_duration = 'recommended'
+    sample_interval = 'recommended'
+    sample_outlier_drop = 'recommended'
+    threshold_min_uptime = 'recommended'
+    threshold_low_gap = 'recommended'
+    snap_minutes = 'recommended'
+    low_gap_minutes = 'recommended'
+    high_gap_minutes = 'recommended'
+
+    weight_restart_soon = 'optional'
+    weight_ram = 'optional'
+    weight_cpu = 'optional'
+    weight_uptime = 'optional'
+    weight_tps = 'optional'
+    weight_low_uptime = 'optional'
+    weight_per_player = 'optional'

{serverwatcher-5.30.7 → serverwatcher-5.31}/src/serverwatcher/defaultconfigs/config.yaml

@@ -1,3 +1,4 @@
+debug: False
 timezone: 'America/Chicago'
 
 panel:
@@ -21,9 +22,10 @@ logger:
   log_path: '/home/container/logs/'
   
   prefixes:
-    info: "<white>[%hh%:%mm%:%ss%] [INFO]: "
-    warn: "<yellow>[%hh%:%mm%:%ss%] [WARN]: "
-    error: "<red>[%hh%:%mm%:%ss%] [ERROR]: "
+    info: '<white>[%hh%:%mm%:%ss%] [INFO]: '
+    warn: '<yellow>[%hh%:%mm%:%ss%] [WARN]: '
+    error: '<red>[%hh%:%mm%:%ss%] [ERROR]: '
+    debug: '<aqua>[%hh%:%mm%:%ss%] [DEBUG]: '
 
 terminal:
   enable_clearing: True

{serverwatcher-5.30.7 → serverwatcher-5.31}/src/serverwatcher/defaultconfigs/messages.yaml

@@ -73,7 +73,7 @@ reasons:
   uptime: 'Uptime {uptime} exceeds {threshold}h'
   tps: 'TPS {tps} is lower than {threshold}'
   low_uptime: 'Uptime {uptime} is shorter than 30m'
-  players: 'There {verb} {count} {plural} online'         # produces: "There are 2 players online" or "There is 1 player online"
+  players: 'There {verb} {count} {plural} online'         # produces: 'There are 2 players online' or 'There is 1 player online'
 
   pro_restart_number: 'Pro-restart: '
   anti_restart_number: 'Anti-restart:'

{serverwatcher-5.30.7 → serverwatcher-5.31}/src/serverwatcher/validator.py

@@ -15,19 +15,19 @@ v = Validator()
 
 def validate_global_config(c):
     for f in fields(GlobalConfig):
-        if not f.name.startswith("__"):
+        if not f.name.startswith('__'):
             v.check_field(c, f.name)
 
 
 def validate_watcher_config(c):
     for f in fields(WatcherConfig):
-        if not f.name.startswith("__"):
+        if not f.name.startswith('__'):
             v.check_field(c, f.name)
 
 
 def validate_messages_config(c):
     for f in fields(MessagesConfig):
-        if not f.name.startswith("__"):
+        if not f.name.startswith('__'):
             v.check_field(c, f.name)
 
 

{serverwatcher-5.30.7 → serverwatcher-5.31}/src/serverwatcher/watcher.py

@@ -114,8 +114,8 @@ class ServerWatcher:
         )
 
         if alive:
-            self.router.info(self.messages.server_back_online_log)
-            self.router.destination(self.messages.server_back_online)
+            self.router.info(self.messages.server_back_online)
+            self.router.destination(self.messages.server_back_online_log)
         else:
             self.router.error(self.messages.server_failed_restart)
 
@@ -124,10 +124,10 @@ class ServerWatcher:
             minimumMinutes=minutes,
             snapMinutes=tuple(sorted(self.watcherconfig.snap_minutes))
         )
-        scheduled = info["scheduled"]
+        scheduled = info['scheduled']
 
         local_time = scheduled.astimezone(self.tz)
-        time_str = local_time.strftime("%I:%M %p")
+        time_str = local_time.strftime('%I:%M %p')
 
         self.router.broadcast(self.messages.broadcast_restart_at, time=time_str)
 
@@ -169,7 +169,7 @@ class ServerWatcher:
         )
 
     def evaluate(self):
-        self.router.info("ServerWatcher is running!")
+        self.router.info('ServerWatcher is running!')
         utils.clearTerminal()
 
         self.router.info(self.messages.startup)
@@ -193,6 +193,13 @@ class ServerWatcher:
         restart_reasons = []
         no_restart_reasons = []
 
+        if self.config.debug:
+            self.router.origin(f'RAM: {snap.ram}/{self.watcherconfig.threshold_ram}', level=self.config.debug_prefix)
+            self.router.origin(f'CPU: {snap.cpu}/{self.watcherconfig.threshold_cpu}', level=self.config.debug_prefix)
+            self.router.origin(f'Uptime: {snap.uptime // 3600}/{self.watcherconfig.threshold_uptime}', level=self.config.debug_prefix)
+            self.router.origin(f'TPS: {snap.tps}/{self.watcherconfig.threshold_tps}', level=self.config.debug_prefix)
+            self.router.origin(f'Players: {snap.players}', level=self.config.debug_prefix)
+
         if snap.ram >= self.watcherconfig.threshold_ram:
             restart_reasons.append(self.res(self.messages.reason_ram, ram=snap.ram, threshold=self.watcherconfig.threshold_ram))
             pro += int(round(snap.ram, 0) - (self.watcherconfig.threshold_ram - 1))
@@ -214,23 +221,23 @@ class ServerWatcher:
             anti += self.watcherconfig.weight_low_uptime
 
         if snap.players > 0:
-            verb = "are" if snap.players != 1 else "is"
-            plural = "players" if snap.players != 1 else "player"
+            verb = 'are' if snap.players != 1 else 'is'
+            plural = 'players' if snap.players != 1 else 'player'
             no_restart_reasons.append(self.res(self.messages.reason_players, verb=verb, count=snap.players, plural=plural))
             anti += snap.players * self.watcherconfig.weight_per_player
 
         if restart_reasons:
             self.router.warn(self.messages.pro_restart_splash)
             for r in restart_reasons:
-                self.router.warn(f"{self.messages.bullet} {r}")
+                self.router.warn(f'{self.messages.bullet} {r}')
 
         if no_restart_reasons:
             self.router.warn(self.messages.anti_restart_splash)
             for r in no_restart_reasons:
-                self.router.warn(f"{self.messages.bullet} {r}")
+                self.router.warn(f'{self.messages.bullet} {r}')
 
-        self.router.warn(f"{self.messages.pro_restart_number} {pro}")
-        self.router.warn(f"{self.messages.anti_restart_number} {anti}")
+        self.router.warn(f'{self.messages.pro_restart_number} {pro}')
+        self.router.warn(f'{self.messages.anti_restart_number} {anti}')
 
         gap = abs(pro - anti)
 
@@ -259,13 +266,11 @@ class ServerWatcher:
         if self.config.handle_keyboard_interrupt:
             try:
                 while True:
-                    self.clearTerminal()
                     self.evaluate()
                     time.sleep(self.watcherconfig.watch_interval)
             except KeyboardInterrupt:
                 self.shutdown()
         else:
             while True:
-                self.clearTerminal()
                 self.evaluate()
                 time.sleep(self.watcherconfig.watch_interval)

{serverwatcher-5.30.7 → serverwatcher-5.31/src/serverwatcher.egg-info}/PKG-INFO

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