serverwatcher 5.26__tar.gz → 5.27.1__tar.gz

{serverwatcher-5.26/src/serverwatcher.egg-info → serverwatcher-5.27.1}/PKG-INFO

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

{serverwatcher-5.26 → serverwatcher-5.27.1}/pyproject.toml

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

{serverwatcher-5.26 → serverwatcher-5.27.1}/src/serverwatcher/configclasses/messages.py

@@ -56,7 +56,6 @@ class MessagesConfig:
 
     restart_action_sent: str = 'restarts.restart_action_sent'
     server_back_online: str = 'restarts.back_online'
-    server_back_online_broadcast: str = 'restarts.back_online_broadcast'
     server_failed_restart: str = 'restarts.failed_restart'
 
 
@@ -112,5 +111,5 @@ class fallbacks:
 
     restart_action_sent = 'Restart action sent. Waiting...'
     server_back_online = 'Server is back online!'
-    server_back_online_broadcast = '{prefix} <green>Restart successful!'
+    server_back_online_log = 'ServerWatcher successfully restarted the server.'
     server_failed_restart = 'Server failed to restart!'

{serverwatcher-5.26 → serverwatcher-5.27.1}/src/serverwatcher/configclasses/watcher.py

@@ -7,6 +7,10 @@ class WatcherConfig:
 
     watch_interval: int = 'watch_interval'
 
+    sample_duration: float = 'sampling.duration'
+    sample_interval: float = 'sampling.interval'
+    sample_outlier_drop: int = 'sampling.drop_outliers'
+
     threshold_ram: int = 'thresholds.ram'
     threshold_cpu: int = 'thresholds.cpu'
     threshold_uptime: int = 'thresholds.uptime'
@@ -36,6 +40,10 @@ class WatcherConfig:
 class fallbacks:
     watch_interval = 300
 
+    sample_duration = 5.0
+    sample_interval = 1.0
+    sample_outlier_drop = 1
+
     threshold_ram = 6
     threshold_cpu = 150
     threshold_uptime = 12

{serverwatcher-5.26 → serverwatcher-5.27.1}/src/serverwatcher/defaultconfigs/messages.yaml

@@ -76,5 +76,5 @@ reasons:
 restarts:
   restart_action_sent: 'Restart action sent. Waiting...'
   back_online: 'Server is back online!'
-  back_online_broadcast: '{prefix} <green>Restart successful!'
+  back_online_log: 'ServerWatcher successfully restarted the server.'
   failed_restart: 'Server failed to restart!'

{serverwatcher-5.26 → serverwatcher-5.27.1}/src/serverwatcher/defaultconfigs/watcher.yaml

@@ -1,5 +1,10 @@
 watch_interval: 300      # in seconds
 
+sampling:
+  duration: 5.0          # total seconds to sample
+  interval: 1.0          # delay between samples (0 = no smoothing)
+  drop_outliers: 1       # number of highest and lowest samples to drop
+
 thresholds:
   ram: 6
   cpu: 150

{serverwatcher-5.26 → serverwatcher-5.27.1}/src/serverwatcher/validator.py

@@ -92,7 +92,7 @@ def validate_watcher_config(watcherconfig):
 
 
 def validate_messages_config(messages):
-    pass
+    pass # may add validation later
     # for f in fields(MessagesConfig):
     #     if f.name.startswith("__"):
     #         continue

{serverwatcher-5.26 → serverwatcher-5.27.1}/src/serverwatcher/watcher.py

@@ -93,6 +93,10 @@ class ServerWatcher:
 
         self.tz = ZoneInfo(self.config.timezone)
 
+    def clearTerminal(self):
+        if self.config.clear_terminal:
+            utils.clearTerminal()
+
     def shutdown(self):
         self.router.info(self.messages.shutdown)
         raise SystemExit
@@ -111,7 +115,7 @@ class ServerWatcher:
 
         if alive:
             self.router.info(self.messages.server_back_online)
-            self.router.broadcast(self.messages.server_back_online_broadcast)
+            self.router.destination(self.messages.server_back_online_log)
         else:
             self.router.error(self.messages.server_failed_restart)
 
@@ -166,7 +170,7 @@ class ServerWatcher:
             self.shutdown()
 
         self.server.refresh()
-        snap = utils.Snapshot(self.server, duration=2.0, interval=1.0, drop_outliers=1, gb=True)
+        snap = utils.Snapshot(self.server, duration=self.watcherconfig.sample_duration, interval=self.watcherconfig.sample_interval, drop_outliers=self.watcherconfig.sample_outlier_drop, gb=True)
 
         pro = 0
         anti = 0
@@ -245,15 +249,13 @@ class ServerWatcher:
         if self.config.handle_keyboard_interrupt:
             try:
                 while True:
-                    if self.config.clear_terminal:
-                        utils.clearTerminal()
+                    self.clearTerminal()
                     self.evaluate()
                     time.sleep(self.watcherconfig.watch_interval)
             except KeyboardInterrupt:
                 self.shutdown()
         else:
             while True:
-                if self.config.clear_terminal:
-                    utils.clearTerminal()
+                self.clearTerminal()
                 self.evaluate()
                 time.sleep(self.watcherconfig.watch_interval)

{serverwatcher-5.26 → serverwatcher-5.27.1/src/serverwatcher.egg-info}/PKG-INFO

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