serverwatcher 5.7__py3-none-any.whl → 5.8.dev2__py3-none-any.whl

serverwatcher/watcher.py

@@ -3,7 +3,7 @@ import time
 import re
 from zoneinfo import ZoneInfo
 
-from hungerlib import Panel, HungerLogger
+from hungerlib import Panel, MessageRouter
 from hungerlib.servers import MinecraftServer, GenericServer
 from hungerlib.addons import (
     clearTerminal,
@@ -83,10 +83,11 @@ class ServerWatcher:
             server_name=self.config.server_name
         )
 
-        self.log = HungerLogger(
-            name=self.config.logger_name,
+        self.router = ServerRouter(
+            name=logger_name,
             server=self.server,
             log_path=self.config.log_path,
+            formatter=self.fmt,
             console_backspaces=self.config.console_backspaces,
         )
 
@@ -98,8 +99,7 @@ class ServerWatcher:
     def say(self, template, level="info", **fmt):
         if not template:
             return
-        text = self.fmt(template, **fmt)
-        getattr(self.log, level)(text)
+        self.router.say(template, level=level, **fmt)
 
     def shutdown(self):
         self.say(self.messages.shutdown)
@@ -121,7 +121,7 @@ class ServerWatcher:
 
         if alive:
             self.say(self.messages.server_back_online)
-            self.say(self.messages.server_back_online_broadcast)
+            self.say(self.messages.server_back_online_broadcast, broadcast=True)
         else:
             self.say(self.messages.server_failed_restart, level="error")
 
@@ -132,12 +132,12 @@ 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.router.broadcast(self.fmt(self.messages.broadcast_restart_at, time=time_str))
 
         minute_callbacks = {
             int(k.split("_")[1]): (
                 lambda msg=self.fmt(getattr(self.messages, k)):
-                    self.server.sendBroadcast(msg)
+                    self.router.broadcast(msg)
             )
             for k in vars(self.messages)
             if k.startswith("minute_")
@@ -146,7 +146,7 @@ class ServerWatcher:
         second_callbacks = {
             int(k.split("_")[1]): (
                 lambda msg=self.fmt(getattr(self.messages, k)):
-                    self.server.sendBroadcast(msg)
+                    self.router.broadcast(msg)
             )
             for k in vars(self.messages)
             if k.startswith("second_")
@@ -209,15 +209,15 @@ class ServerWatcher:
         if restart_reasons:
             self.say(self.messages.pro_restart_splash, level="warn")
             for r in restart_reasons:
-                self.log.warn(f"{self.messages.bullet} {r}")
+                self.router.warn(f"{self.messages.bullet} {r}")
 
         if no_restart_reasons:
             self.say(self.messages.anti_restart_splash, level="warn")
             for r in no_restart_reasons:
-                self.log.warn(f"{self.messages.bullet} {r}")
+                self.router.warn(f"{self.messages.bullet} {r}")
 
-        self.log.warn(f"{self.messages.pro_restart_number} {pro}")
-        self.log.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)
 

{serverwatcher-5.7.dist-info → serverwatcher-5.8.dev2.dist-info}/METADATA

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

{serverwatcher-5.7.dist-info → serverwatcher-5.8.dev2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 serverwatcher/__init__.py,sha256=Q_afN0XU29n48d6Gf0-LT2lLo3RiTWlHRT6rC_fYbjw,486
 serverwatcher/validator.py,sha256=W1-RX8UQWeO2DKEe3vC1_U6xISe_WnAVXHYT0pf4uWc,4753
-serverwatcher/watcher.py,sha256=WmP0MWZqsg1MtvctXeCcT5WcT2i4Q_qgGJx1Nfd-Wvs,8461
+serverwatcher/watcher.py,sha256=8WoKBpuGLx2qbG1Ivd_B7gpRghOKUnKRDyV-d-eAEOw,8475
 serverwatcher/configclasses/__init__.py,sha256=YS0KhxtAJGdMcaiFstqTRNxIPLnR7s9v3Tkt5h2uKE4,182
 serverwatcher/configclasses/config.py,sha256=cnrRYaJ7W-SuUuVZI2tFgGWtmlLkMNNy51HxTud4tB8,1110
 serverwatcher/configclasses/messages.py,sha256=JZawv8_Kn9rns_bbuw0cuk5DhwinlueCao63NJIttXo,2770
@@ -8,8 +8,8 @@ serverwatcher/configclasses/watcher.py,sha256=urQvRr8b7OjK0sm5eovSg9S3vo0LWZxE0c
 serverwatcher/defaultconfigs/config.yaml,sha256=lq-eTwAG4QQKIJKniMeEj9eD_DG06zMNf-C7Scqa9KI,461
 serverwatcher/defaultconfigs/messages.yaml,sha256=Zft8a1XrZj2YcdVg1njQM55RZTCZdDWzaxi2raIPeOo,2090
 serverwatcher/defaultconfigs/watcher.yaml,sha256=1XUr7p5qRiaZkSccULVgEAGvHMFOM2IPNBRxdnG86NA,380
-serverwatcher-5.7.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-serverwatcher-5.7.dist-info/METADATA,sha256=xaF2yxp8x9f2oGngq5STXFGBXZOaHXmLU_LT644wsUk,1681
-serverwatcher-5.7.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-serverwatcher-5.7.dist-info/top_level.txt,sha256=8DJAf8WmmglgtZHkp8aoTriRJ2YPcS4F3DfOIkytASo,14
-serverwatcher-5.7.dist-info/RECORD,,
+serverwatcher-5.8.dev2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+serverwatcher-5.8.dev2.dist-info/METADATA,sha256=gY1zVDXw5TxlZL8EnDsiV0rdPK85N0spGnmgGUpNOqA,1686
+serverwatcher-5.8.dev2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+serverwatcher-5.8.dev2.dist-info/top_level.txt,sha256=8DJAf8WmmglgtZHkp8aoTriRJ2YPcS4F3DfOIkytASo,14
+serverwatcher-5.8.dev2.dist-info/RECORD,,