serverwatcher 4.8__tar.gz → 5.0__tar.gz

{serverwatcher-4.8/src/serverwatcher.egg-info → serverwatcher-5.0}/PKG-INFO

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

{serverwatcher-4.8 → serverwatcher-5.0}/pyproject.toml

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

serverwatcher-5.0/src/serverwatcher/configclasses/global_config.py

@@ -0,0 +1,30 @@
+from dataclasses import dataclass, field
+
+def yaml_key(name: str):
+    return field(metadata={"yaml_key": name})
+
+@dataclass
+class GlobalConfig:
+    watch_interval: int = yaml_key("watch_interval")
+
+    panel_name: str = yaml_key("panel_name")
+    panel_url: str = yaml_key("panel_url")
+    panel_api_key: str = yaml_key("panel_api_key")
+
+    origin_server_id: str = yaml_key("origin_server_id")
+
+    server_name: str = yaml_key("server_name")
+    server_id: str = yaml_key("server_id")
+    server_domain: str = yaml_key("server_domain")
+    server_port: int = yaml_key("server_port")
+    rcon_port: int = yaml_key("rcon_port")
+    rcon_password: str = yaml_key("rcon_password")
+    tps_command: str = yaml_key("tps_command")
+    
+    do_logging: bool = yaml_key("do_logging")
+    logger_name: str = yaml_key("logger_name")
+    log_path: str = yaml_key("log_path")
+    timezone: str = yaml_key("timezone")
+
+    console_backspaces: int = yaml_key("console_backspaces")
+    clear_terminal: bool = yaml_key("clear_terminal")

serverwatcher-5.0/src/serverwatcher/configclasses/messages.py

@@ -0,0 +1,65 @@
+from dataclasses import dataclass, field
+
+def yaml_key(name: str):
+    return field(metadata={"yaml_key": name})
+
+@dataclass
+class MessagesConfig:
+    prefix: str = yaml_key("prefix")
+
+    broadcast_restart_at: str = yaml_key("broadcast_restart_at")
+    bullet: str = yaml_key("bullet")
+
+    # minute messages
+    minute_120: str = yaml_key("minute_120")
+    minute_60: str = yaml_key("minute_60")
+    minute_45: str = yaml_key("minute_45")
+    minute_30: str = yaml_key("minute_30")
+    minute_15: str = yaml_key("minute_15")
+    minute_5: str = yaml_key("minute_5")
+    minute_1: str = yaml_key("minute_1")
+
+    # second messages
+    second_10: str = yaml_key("second_10")
+    second_9: str = yaml_key("second_9")
+    second_8: str = yaml_key("second_8")
+    second_7: str = yaml_key("second_7")
+    second_6: str = yaml_key("second_6")
+    second_5: str = yaml_key("second_5")
+    second_4: str = yaml_key("second_4")
+    second_3: str = yaml_key("second_3")
+    second_2: str = yaml_key("second_2")
+    second_1: str = yaml_key("second_1")
+
+    # logging
+    log_start: str = yaml_key("log_start")
+    log_status_check: str = yaml_key("log_status_check")
+    log_validation_fail: str = yaml_key("log_validation_fail")
+    log_validation_ok: str = yaml_key("log_validation_ok")
+    log_shutdown: str = yaml_key("log_shutdown")
+    log_immediate_restart: str = yaml_key("log_immediate_restart")
+    log_no_restart: str = yaml_key("log_no_restart")
+    log_scheduled: str = yaml_key("log_scheduled")
+    log_gap_low: str = yaml_key("log_gap_low")
+    log_gap_high: str = yaml_key("log_gap_high")
+
+    # reasons
+    pro_restart_splash: str = yaml_key("pro_restart_splash")
+    anti_restart_splash: str = yaml_key("anti_restart_splash")
+
+    reason_restart_soon: str = yaml_key("reason_restart_soon")
+    reason_ram: str = yaml_key("reason_ram")
+    reason_cpu: str = yaml_key("reason_cpu")
+    reason_uptime: str = yaml_key("reason_uptime")
+    reason_tps: str = yaml_key("reason_tps")
+    reason_low_uptime: str = yaml_key("reason_low_uptime")
+    reason_players: str = yaml_key("reason_players")
+
+    pro_restart_number: str = yaml_key("pro_restart_number")
+    anti_restart_number: str = yaml_key("anti_restart_number")
+
+    # restarts
+    restart_action_sent: str = yaml_key("restart_action_sent")
+    server_back_online: str = yaml_key("server_back_online")
+    server_back_online_broadcast: str = yaml_key("server_back_online_broadcast")
+    server_failed_restart: str = yaml_key("server_failed_restart")

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

@@ -0,0 +1,30 @@
+from dataclasses import dataclass, field
+
+def yaml_key(name: str):
+    return field(metadata={"yaml_key": name})
+
+@dataclass
+class WatcherConfig:
+    schedule_control: bool = yaml_key("schedule_control")
+    restart_soon_id: int = yaml_key("restart_soon_id")
+
+    ram_threshold: int = yaml_key("ram_threshold")
+    cpu_threshold: int = yaml_key("cpu_threshold")
+    uptime_hours_threshold: int = yaml_key("uptime_hours_threshold")
+    tps_threshold: float = yaml_key("tps_threshold")
+
+    weight_restart_soon: int = yaml_key("weight_restart_soon")
+    weight_ram: int = yaml_key("weight_ram")
+    weight_cpu: int = yaml_key("weight_cpu")
+    weight_uptime: int = yaml_key("weight_uptime")
+    weight_tps: int = yaml_key("weight_tps")
+
+    weight_low_uptime: int = yaml_key("weight_low_uptime")
+    weight_per_player: int = yaml_key("weight_per_player")
+
+    low_gap_minutes: int = yaml_key("low_gap_minutes")
+    high_gap_minutes: int = yaml_key("high_gap_minutes")
+
+    restart_wait_seconds: int = yaml_key("restart_wait_seconds")
+    restart_online_timeout: int = yaml_key("restart_online_timeout")
+    restart_online_interval: int = yaml_key("restart_online_interval")

{serverwatcher-4.8 → serverwatcher-5.0}/src/serverwatcher/defaultconfigs/messages.yaml

@@ -48,6 +48,9 @@ reasons:
   reason_low_uptime: "Uptime {uptime} is shorter than 30m"
   reason_players: "There {verb} {count} {plural} online"
 
+  pro_restart_number: "Pro-restart: "
+  anti_restart_number: "Anti-restart:"
+
 restarts:
   restart_action_sent: "Restart action sent. Waiting..."
   server_back_online: "Server is back online!"

{serverwatcher-4.8 → serverwatcher-5.0}/src/serverwatcher/watcher.py

@@ -82,10 +82,10 @@ class ServerWatcher:
     def fmt(self, template: str, **kwargs):
         return template.format(prefix=self.messages.prefix, **kwargs)
 
-    def say(self, msg, level="info", **fmt):
-        if not msg:
+    def say(self, key, level="info", **fmt):
+        if not key:
             return
-        text = self.fmt(msg, **fmt)
+        text = self.fmt(key, **fmt)
         getattr(self.log, level)(text)
 
     def shutdown(self):
@@ -196,7 +196,7 @@ class ServerWatcher:
         if restart_reasons:
             self.say(self.messages.pro_restart_splash, level="warn")
             for r in restart_reasons:
-                self.log.warn(f"- {r}")
+                self.log.warn(f"{self.messages.bullet} {r}")
             self.log.warn("\n")
 
         if no_restart_reasons:
@@ -205,8 +205,8 @@ class ServerWatcher:
                 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}")
+        self.log.warn(f"{self.messages.pro_restart_number} {pro}")
+        self.log.warn(f"{self.messages.anti_restart_number} {anti}")
 
         gap = abs(pro - anti)
 

{serverwatcher-4.8 → serverwatcher-5.0/src/serverwatcher.egg-info}/PKG-INFO

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

serverwatcher-4.8/src/serverwatcher/configclasses/global_config.py

@@ -1,27 +0,0 @@
-from dataclasses import dataclass
-
-@dataclass
-class GlobalConfig:
-    watch_interval: int
-
-    panel_name: str
-    panel_url: str
-    panel_api_key: str
-
-    origin_server_id: str
-
-    server_name: str
-    server_id: str
-    server_domain: str
-    server_port: int
-    rcon_port: int
-    rcon_password: str
-    tps_command: str
-    
-    do_logging: bool
-    logger_name: str
-    log_path: str
-    timezone: str
-
-    console_backspaces: int
-    clear_terminal: bool

serverwatcher-4.8/src/serverwatcher/configclasses/messages.py

@@ -1,60 +0,0 @@
-from dataclasses import dataclass, field
-
-@dataclass
-@dataclass
-class MessagesConfig:
-    prefix: str
-    
-    broadcast_restart_at: str
-    bullet: str
-
-    # minute messages
-    minute_120: str
-    minute_60: str
-    minute_45: str
-    minute_30: str
-    minute_15: str
-    minute_5: str
-    minute_1: str
-
-    # second messages
-    second_10: str
-    second_9: str
-    second_8: str
-    second_7: str
-    second_6: str
-    second_5: str
-    second_4: str
-    second_3: str
-    second_2: str
-    second_1: str
-
-    # logging
-    log_start: str
-    log_status_check: str
-    log_validation_fail: str
-    log_validation_ok: str
-    log_shutdown: str
-    log_immediate_restart: str
-    log_no_restart: str
-    log_scheduled: str
-    log_gap_low: str
-    log_gap_high: str
-
-    # reasons
-    pro_restart_splash: str
-    anti_restart_splash: str
-
-    reason_restart_soon: str
-    reason_ram: str
-    reason_cpu: str
-    reason_uptime: str
-    reason_tps: str
-    reason_low_uptime: str
-    reason_players: str
-
-    # restarts
-    restart_action_sent: str
-    server_back_online: str
-    server_back_online_broadcast: str
-    server_failed_restart: str

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

@@ -1,27 +0,0 @@
-from dataclasses import dataclass
-
-@dataclass
-class WatcherConfig:
-    schedule_control: bool
-    restart_soon_id: int
-
-    ram_threshold: int
-    cpu_threshold: int
-    uptime_hours_threshold: int
-    tps_threshold: float
-
-    weight_restart_soon: int
-    weight_ram: int
-    weight_cpu: int
-    weight_uptime: int
-    weight_tps: int
-
-    weight_low_uptime: int
-    weight_per_player: int
-
-    low_gap_minutes: int
-    high_gap_minutes: int
-
-    restart_wait_seconds: int
-    restart_online_timeout: int
-    restart_online_interval: int