serverwatcher 4.6__tar.gz → 4.7.1__tar.gz

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

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

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

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

{serverwatcher-4.6 → serverwatcher-4.7.1}/src/serverwatcher/configclasses/messages.py

@@ -4,7 +4,9 @@ from dataclasses import dataclass, field
 @dataclass
 class MessagesConfig:
     prefix: str
+    
     broadcast_restart_at: str
+    bullet: str
 
     # minute messages
     minute_120: str
@@ -40,6 +42,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.7.1/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.6 → serverwatcher-4.7.1}/src/serverwatcher/defaultconfigs/messages.yaml

@@ -1,6 +1,7 @@
-prefix: "<aqua>[Server Watcher]"
+prefix: "<reset><aqua>[Server Watcher]"
 
 broadcast_restart_at: "{prefix} The server will restart at {time} CDT."
+bullet: "-"
 
 broadcast_minute:
   minute_120: "{prefix} Restart in 2 hours!"
@@ -36,6 +37,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.6 → serverwatcher-4.7.1}/src/serverwatcher/defaultconfigs/watcher.yaml

@@ -22,6 +22,6 @@ gaps:
   high_gap_minutes: 60
 
 restart_intervals:
-  restart_wait_seconds: 45
+  restart_wait_seconds: 30
   restart_online_timeout: 120
   restart_online_interval: 2

{serverwatcher-4.6 → serverwatcher-4.7.1}/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()
@@ -107,7 +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.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)
 
@@ -119,9 +118,7 @@ class ServerWatcher:
         local_time = scheduled.astimezone(self.tz)
         time_str = local_time.strftime("%I:%M %p")
 
-        self.server.sendBroadcast(
-            self.fmt(self.messages.broadcast_restart_at, time=time_str)
-        )
+        self.server.sendBroadcast(self.fmt(self.messages.broadcast_restart_at, time=time_str))
 
         # minute_* callbacks
         minute_callbacks = {
@@ -171,15 +168,11 @@ class ServerWatcher:
             pro += self.cfg.weight_restart_soon
 
         if snap.ram >= self.cfg.ram_threshold:
-            restart_reasons.append(
-                self.fmt(self.messages.reason_ram, ram=snap.ram, threshold=self.cfg.ram_threshold)
-            )
+            restart_reasons.append(self.fmt(self.messages.reason_ram, ram=snap.ram, threshold=self.cfg.ram_threshold))
             pro += int(round(snap.ram, 0) - (self.cfg.ram_threshold - 1))
 
         if snap.cpu >= self.cfg.cpu_threshold:
-            restart_reasons.append(
-                self.fmt(self.messages.reason_cpu, cpu=snap.cpu, threshold=self.cfg.cpu_threshold)
-            )
+            restart_reasons.append(self.fmt(self.messages.reason_cpu, cpu=snap.cpu, threshold=self.cfg.cpu_threshold))
             pro += self.cfg.weight_cpu
 
         if snap.uptime // 3600 >= self.cfg.uptime_hours_threshold:
@@ -189,32 +182,33 @@ class ServerWatcher:
             )
             pro += self.cfg.weight_uptime
 
-        if snap.tps <= self.cfg.tps_threshold:
-            restart_reasons.append(
-                self.fmt(self.messages.reason_tps, tps=snap.tps, threshold=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))
             pro += self.cfg.weight_tps
 
         # anti-restart
         if snap.uptime // 60 < 30:
-            no_restart_reasons.append(
-                self.fmt(self.messages.reason_low_uptime, uptime=snap.uptime_formatted)
-            )
+            no_restart_reasons.append(self.fmt(self.messages.reason_low_uptime, uptime=snap.uptime_formatted))
             anti += self.cfg.weight_low_uptime
 
         if snap.players > 0:
             verb = "are" if snap.players != 1 else "is"
             plural = "players" if snap.players != 1 else "player"
-            no_restart_reasons.append(
-                self.fmt(self.messages.reason_players, verb=verb, count=snap.players, plural=plural)
-            )
+            no_restart_reasons.append(self.fmt(self.messages.reason_players, verb=verb, count=snap.players, plural=plural))
             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"{self.messages.bullet} {r}")
+            self.log.warn("\n")
 
         self.log.warn(f"Pro-restart:  {pro}")
         self.log.warn(f"Anti-restart: {anti}")
@@ -236,7 +230,6 @@ class ServerWatcher:
         if gap <= 2:
             self.log.warn(self.fmt(self.messages.log_gap_low, gap=gap))
             self.schedule_restart(self.cfg.low_gap_minutes)
-        else:
             self.log.warn(self.fmt(self.messages.log_gap_high, gap=gap))
             self.schedule_restart(self.cfg.high_gap_minutes)
 

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

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

serverwatcher-4.6/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