serverwatcher 5.1__tar.gz → 5.1.2__tar.gz

{serverwatcher-5.1/src/serverwatcher.egg-info → serverwatcher-5.1.2}/PKG-INFO

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

{serverwatcher-5.1 → serverwatcher-5.1.2}/pyproject.toml

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

{serverwatcher-5.1 → serverwatcher-5.1.2}/src/serverwatcher/__init__.py

@@ -7,7 +7,7 @@ except PackageNotFoundError:
     __version__ = '0.0.0'
 
 from .watcher import ServerWatcher
-from .configclasses.global_config import GlobalConfig
+from .configclasses.config import GlobalConfig
 from .configclasses.messages import MessagesConfig
 from .configclasses.watcher import WatcherConfig
 

{serverwatcher-5.1 → serverwatcher-5.1.2}/src/serverwatcher/configclasses/messages.py

@@ -44,13 +44,13 @@ class MessagesConfig:
     pro_restart_splash: str = yaml_key("reasons.pro_restart_splash")
     anti_restart_splash: str = yaml_key("reasons.anti_restart_splash")
 
-    reasons.restart_soon: str = yaml_key("reasons.restart_soon")
-    reasons.ram: str = yaml_key("reasons.ram")
-    reasons.cpu: str = yaml_key("reasons.cpu")
-    reasons.uptime: str = yaml_key("reasons.uptime")
-    reasons.tps: str = yaml_key("reasons.tps")
-    reasons.low_uptime: str = yaml_key("reasons.low_uptime")
-    reasons.players: str = yaml_key("reasons.players")
+    reason_restart_soon: str = yaml_key("reasons.restart_soon")
+    reason_ram: str = yaml_key("reasons.ram")
+    reason_cpu: str = yaml_key("reasons.cpu")
+    reason_uptime: str = yaml_key("reasons.uptime")
+    reason_tps: str = yaml_key("reasons.tps")
+    reason_low_uptime: str = yaml_key("reasons.low_uptime")
+    reason_players: str = yaml_key("reasons.players")
 
     pro_restart_number: str = yaml_key("reasons.pro_restart_number")
     anti_restart_number: str = yaml_key("reasons.anti_restart_number")

serverwatcher-5.1.2/src/serverwatcher/configclasses/watcher.py

@@ -0,0 +1,30 @@
+from dataclasses import dataclass, field
+
+def yaml_key(path: str):
+    return field(metadata={"yaml_key": path})
+
+@dataclass
+class WatcherConfig:
+    schedule_control: bool = yaml_key("schedule_control.enabled")
+    restart_soon_id: int = yaml_key("schedule_control.restart_soon_id")
+
+    threshold_ram: int = yaml_key("thresholds.ram")
+    threshold_cpu: int = yaml_key("thresholds.cpu")
+    threshold_uptime_hours: int = yaml_key("thresholds.uptime")
+    threshold_tps: float = yaml_key("thresholds.tps")
+
+    weight_restart_soon: int = yaml_key("weights.restart_soon")
+    weight_ram: int = yaml_key("weights.ram")
+    weight_cpu: int = yaml_key("weights.cpu")
+    weight_uptime: int = yaml_key("weights.uptime")
+    weight_tps: int = yaml_key("weights.tps")
+
+    weight_low_uptime: int = yaml_key("weights.low_uptime")
+    weight_per_player: int = yaml_key("weights.per_player")
+
+    low_gap_minutes: int = yaml_key("gaps.low_gap_minutes")
+    high_gap_minutes: int = yaml_key("gaps.high_gap_minutes")
+
+    restart_wait_seconds: int = yaml_key("restart.wait_seconds")
+    restart_timeout: int = yaml_key("restart.online_timeout")
+    restart_online_interval: int = yaml_key("restart.online_interval")

{serverwatcher-5.1 → serverwatcher-5.1.2}/src/serverwatcher/validator.py

@@ -60,17 +60,17 @@ def validate_global_config(config, errors):
 
 
 def validate_watcher_config(watcherconfig, errors):
-    if watcherconfig.restart.wait_seconds < 1:
-        errors.append(f"restart.wait_seconds: must be >= 1 (got {watcherconfig.restart.wait_seconds})")
+    if watcherconfig.restart_wait_seconds < 1:
+        errors.append(f"restart_wait_seconds: must be >= 1 (got {watcherconfig.restart_wait_seconds})")
 
-    if watcherconfig.thresholds.cpu <= 0:
-        errors.append(f"thresholds.cpu: must not be less than 1 (got {watcherconfig.thresholds.cpu})")
+    if watcherconfig.threshold_cpu <= 0:
+        errors.append(f"threshold_cpu: must not be less than 1 (got {watcherconfig.threshold_cpu})")
 
-    if watcherconfig.thresholds.ram <= 0:
-        errors.append(f"thresholds.ram: must be > 0 (got {watcherconfig.thresholds.ram})")
+    if watcherconfig.threshold_ram <= 0:
+        errors.append(f"threshold_ram: must be > 0 (got {watcherconfig.threshold_ram})")
 
-    if watcherconfig.thresholds.tps <= 0 or watcherconfig.thresholds.tps > 20:
-        errors.append(f"thresholds.tps: must be 1–20 (got {watcherconfig.thresholds.tps})")
+    if watcherconfig.threshold_tps <= 0 or watcherconfig.threshold_tps > 20:
+        errors.append(f"threshold_tps: must be 1–20 (got {watcherconfig.threshold_tps})")
 
 
 def validate_messages_config(messages, errors):
@@ -108,7 +108,7 @@ def validate_all():
     errors = []
     defaults = []
 
-    config = loadConfig("config/global.yaml", "/defaultconfigs/global.yaml", GlobalConfig)
+    config = loadConfig("config/config.yaml", "/defaultconfigs/config.yaml", GlobalConfig)
     messages = loadConfig("config/messages.yaml", "/defaultconfigs/messages.yaml", MessagesConfig)
     watcher = loadConfig("config/watcher.yaml", "/defaultconfigs/watcher.yaml", WatcherConfig)
 

{serverwatcher-5.1 → serverwatcher-5.1.2}/src/serverwatcher/watcher.py

@@ -97,13 +97,13 @@ class ServerWatcher:
             self.origin.disableSchedule(self.watcherconfig.restart_soon_id)
         self.server.restart()
         self.say(self.messages.restart_action_sent)
-        time.sleep(self.watcherconfig.restart.wait_seconds)
+        time.sleep(self.watcherconfig.restart_wait_seconds)
 
         self.say(self.messages.log_status_check, level="warn")
         alive = waitForOnline(
             self.server,
-            timeout=self.watcherconfig.restart.timeout,
-            interval=self.watcherconfig.restart.online_interval,
+            timeout=self.watcherconfig.restart_timeout,
+            interval=self.watcherconfig.restart_online_interval,
         )
 
         if alive:
@@ -161,37 +161,37 @@ class ServerWatcher:
         no_restart_reasons = []
 
         if self.watcherconfig.schedule_control and self.server.getSchedule(self.watcherconfig.restart_soon_id)["is_active"]:
-            restart_reasons.append(self.messages.reasons.restart_soon)
-            pro += self.watcherconfig.weights.restart_soon
+            restart_reasons.append(self.messages.reason_restart_soon)
+            pro += self.watcherconfig.weight_restart_soon
 
-        if snap.ram >= self.watcherconfig.thresholds.ram:
-            restart_reasons.append(self.fmt(self.messages.reasons.ram, ram=snap.ram, threshold=self.watcherconfig.thresholds.ram))
-            pro += int(round(snap.ram, 0) - (self.watcherconfig.thresholds.ram - 1))
+        if snap.ram >= self.watcherconfig.threshold_ram:
+            restart_reasons.append(self.fmt(self.messages.reason_ram, ram=snap.ram, threshold=self.watcherconfig.threshold_ram))
+            pro += int(round(snap.ram, 0) - (self.watcherconfig.threshold_ram - 1))
 
-        if snap.cpu >= self.watcherconfig.thresholds.cpu:
-            restart_reasons.append(self.fmt(self.messages.reasons.cpu, cpu=snap.cpu, threshold=self.watcherconfig.thresholds.cpu))
-            pro += self.watcherconfig.weights.cpu
+        if snap.cpu >= self.watcherconfig.threshold_cpu:
+            restart_reasons.append(self.fmt(self.messages.reason_cpu, cpu=snap.cpu, threshold=self.watcherconfig.threshold_cpu))
+            pro += self.watcherconfig.weight_cpu
 
-        if snap.uptime // 3600 >= self.watcherconfig.thresholds.uptime:
+        if snap.uptime // 3600 >= self.watcherconfig.threshold_uptime:
             restart_reasons.append(
-                self.fmt(self.messages.reasons.uptime, uptime=snap.uptime_formatted,
-                         threshold=self.watcherconfig.thresholds.uptime)
+                self.fmt(self.messages.reason_uptime, uptime=snap.uptime_formatted,
+                         threshold=self.watcherconfig.threshold_uptime)
             )
             pro += self.watcherconfig.weight_uptime
 
-        if (snap.tps if snap.tps is not None else 0) <= self.watcherconfig.thresholds.tps:
-            restart_reasons.append(self.fmt(self.messages.reasons.tps, tps=snap.tps, threshold=self.watcherconfig.thresholds.tps))
-            pro += self.watcherconfig.weights.tps
+        if (snap.tps if snap.tps is not None else 0) <= self.watcherconfig.threshold_tps:
+            restart_reasons.append(self.fmt(self.messages.reason_tps, tps=snap.tps, threshold=self.watcherconfig.threshold_tps))
+            pro += self.watcherconfig.weight_tps
 
         if snap.uptime // 60 < 30:
-            no_restart_reasons.append(self.fmt(self.messages.reasons.low_uptime, uptime=snap.uptime_formatted))
-            anti += self.watcherconfig.weights.low_uptime
+            no_restart_reasons.append(self.fmt(self.messages.reason_low_uptime, uptime=snap.uptime_formatted))
+            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"
-            no_restart_reasons.append(self.fmt(self.messages.reasons.players, verb=verb, count=snap.players, plural=plural))
-            anti += snap.players * self.watcherconfig.weights.per_player
+            no_restart_reasons.append(self.fmt(self.messages.reason_players, verb=verb, count=snap.players, plural=plural))
+            anti += snap.players * self.watcherconfig.weight_per_player
 
         if restart_reasons:
             self.say(self.messages.pro_restart_splash, level="warn")

{serverwatcher-5.1 → serverwatcher-5.1.2/src/serverwatcher.egg-info}/PKG-INFO

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

serverwatcher-5.1/src/serverwatcher/configclasses/watcher.py

@@ -1,30 +0,0 @@
-from dataclasses import dataclass, field
-
-def yaml_key(path: str):
-    return field(metadata={"yaml_key": path})
-
-@dataclass
-class WatcherConfig:
-    schedule_control: bool = yaml_key("schedule_control.enabled")
-    restart_soon_id: int = yaml_key("schedule_control.restart_soon_id")
-
-    thresholds.ram: int = yaml_key("thresholds.ram")
-    thresholds.cpu: int = yaml_key("thresholds.cpu")
-    thresholds.uptime_hours: int = yaml_key("thresholds.uptime")
-    thresholds.tps: float = yaml_key("thresholds.tps")
-
-    weights.restart_soon: int = yaml_key("weights.restart_soon")
-    weights.ram: int = yaml_key("weights.ram")
-    weights.cpu: int = yaml_key("weights.cpu")
-    weights.uptime: int = yaml_key("weights.uptime")
-    weights.tps: int = yaml_key("weights.tps")
-
-    weights.low_uptime: int = yaml_key("weights.low_uptime")
-    weights.per_player: int = yaml_key("weights.per_player")
-
-    low_gap_minutes: int = yaml_key("gaps.low_gap_minutes")
-    high_gap_minutes: int = yaml_key("gaps.high_gap_minutes")
-
-    restart.wait_seconds: int = yaml_key("restart.wait_seconds")
-    restart.timeout: int = yaml_key("restart.online_timeout")
-    restart.online_interval: int = yaml_key("restart.online_interval")