serverwatcher 3.6__tar.gz → 3.6.2__tar.gz

{serverwatcher-3.6/src/serverwatcher.egg-info → serverwatcher-3.6.2}/PKG-INFO

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

{serverwatcher-3.6 → serverwatcher-3.6.2}/pyproject.toml

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

{serverwatcher-3.6 → serverwatcher-3.6.2}/src/serverwatcher/config/global_config.py

@@ -9,9 +9,9 @@ class GlobalConfig:
     origin_server_id: str
 
     server_name: str
-    server_server_id: str
+    server_id: str
     server_domain: str
     server_port: int
-    server_rcon_port: int
-    server_rcon_password: str
-    server_tps_command: str
+    rcon_port: int
+    rcon_password: str
+    tps_command: str

serverwatcher-3.6.2/src/serverwatcher/defaultconfigs/global.yaml

@@ -0,0 +1,16 @@
+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

{serverwatcher-3.6 → serverwatcher-3.6.2}/src/serverwatcher/watcher.py

@@ -24,10 +24,6 @@ PACKAGE_DIR = os.path.dirname(__file__)
 
 # Load configs
 def load_or_default(path: str, default_path: str, schema):
-    """
-    Loads YAML from path. If missing, copies default_path → path.
-    Then maps YAML → dataclass.
-    """
 
     abs_path = os.path.join(BASE_DIR, path)
     abs_default = os.path.join(PACKAGE_DIR, default_path)
@@ -80,11 +76,11 @@ class ServerWatcher:
         )
 
         self.server = MinecraftServer(
-            name=self.global_cfg.name,
+            name=self.global_cfg.server_name,
             panel=self.panel,
             server_id=self.global_cfg.server_id,
-            server_domain=self.global_cfg.domain,
-            server_port=self.global_cfg.port,
+            server_domain=self.global_cfg.server_domain,
+            server_port=self.global_cfg.server_port,
             rcon_port=self.global_cfg.rcon_port,
             rcon_password=self.global_cfg.rcon_password,
             tpsCommand=self.global_cfg.tps_command,
@@ -93,7 +89,7 @@ class ServerWatcher:
 
         # logger
         logger_name = self.cfg.logger_name_template.format(
-            server_name=s["name"]
+            server_name=self.global_cfg.server_name
         )
 
         self.log = HungerLogger(
@@ -193,7 +189,7 @@ class ServerWatcher:
             restart_reasons.append(
                 self.fmt(self.messages.reason_ram, ram=snap.ram, threshold=self.cfg.ram_threshold)
             )
-            pro += int(round(snap.ram, 0) - 5)
+            pro += int(round(snap.ram, 0) - (self.watcher.ram_thresold - 1))
 
         if snap.cpu >= self.cfg.cpu_threshold:
             restart_reasons.append(

{serverwatcher-3.6 → serverwatcher-3.6.2/src/serverwatcher.egg-info}/PKG-INFO

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

serverwatcher-3.6/src/serverwatcher/defaultconfigs/global.yaml

@@ -1,16 +0,0 @@
-panel:
-  name: My Panel
-  url: https://example.com
-  api_key: CHANGE_ME
-
-origin:
-  server_id: CHANGE_ME
-
-server:
-  name: My SMP
-  server_id: CHANGE_ME
-  domain: mc.example.com
-  port: 25565
-  rcon_port: 25575
-  rcon_password: password
-  tps_command: ticks