serverwatcher 5.1.5__tar.gz → 5.2.1__tar.gz

{serverwatcher-5.1.5/src/serverwatcher.egg-info → serverwatcher-5.2.1}/PKG-INFO

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

{serverwatcher-5.1.5 → serverwatcher-5.2.1}/pyproject.toml

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

serverwatcher-5.2.1/src/serverwatcher/defaultconfigs/config.yaml

@@ -0,0 +1,28 @@
+watch_interval: 300
+
+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'
+
+logger:
+  enabled: True
+  name: 'Server Watcher'
+  log_path: '/home/container/logs/'
+  timezone: 'America/Chicago'
+
+terminal:
+  backspaces: 8
+  enable_clearing: True

serverwatcher-5.2.1/src/serverwatcher/defaultconfigs/messages.yaml

@@ -0,0 +1,58 @@
+prefix: '<aqua>[Server Watcher]'
+
+broadcast_restart_at: '{prefix} The server will restart at {time} CDT.'
+bullet: '-'
+
+broadcast_minutes:
+  '120': '{prefix} Restart in 2 hours!'
+  '60': '{prefix} Restart in 1 hour!'
+  '45': '{prefix} Restart in 45 minutes!'
+  '30': '{prefix} Restart in 30 minutes!'
+  '15': '{prefix} Restart in 15 minutes!'
+  '5': '{prefix} Restart in 5 minutes!'
+  '1': '{prefix} Restart in 1 minute!'
+
+broadcast_seconds:
+  '10': '{prefix} Restart in 10 seconds!'
+  '9': '{prefix} Restart in 9 seconds!'
+  '8': '{prefix} Restart in 8 seconds!'
+  '7': '{prefix} Restart in 7 seconds!'
+  '6': '{prefix} Restart in 6 seconds!'
+  '5': '{prefix} Restart in 5 seconds!'
+  '4': '{prefix} Restart in 4 seconds!'
+  '3': '{prefix} Restart in 3 seconds!'
+  '2': '{prefix} Restart in 2 seconds!'
+  '1': '{prefix} Restart in 1 second!'
+
+logging:
+  startup: 'ServerWatcher is running!'
+  status_check: 'Checking server status...'
+  validation_fail: 'Validation FAILED.'
+  validation_ok: 'All validation checks succeeded.'
+  shutdown: 'Shutting down ServerWatcher.'
+  immediate_restart: 'Restarting immediately.'
+  no_restart: 'The server does not need to restart.'
+  scheduled: 'Restart needed, but anti-restart factors outweigh it.'
+  gap_low: 'Gap {gap}. Scheduling restart in 2 hours.'
+  gap_high: 'Gap {gap}. Scheduling restart in 1 hour.'
+
+reasons:
+  pro_splash: 'PRO-RESTART REASONS:'
+  anti_splash: 'ANTI-RESTART REASONS:'
+
+  restart_soon: 'The server is set to restart soon'
+  ram: 'RAM usage ({ram}) is higher than {threshold} GB'
+  cpu: 'CPU usage ({cpu}) is higher than {threshold}%'
+  uptime: 'Uptime {uptime} exceeds {threshold}h'
+  tps: 'TPS {tps} is lower than {threshold}'
+  low_uptime: 'Uptime {uptime} is shorter than 30m'
+  players: 'There {verb} {count} {plural} online'
+
+  pro_restart_number: 'Pro-restart: '
+  anti_restart_number: 'Anti-restart:'
+
+restarts:
+  restart_action_sent: 'Restart action sent. Waiting...'
+  back_online: 'Server is back online!'
+  back_online_broadcast: '{prefix} <green>Restart successful!'
+  failed_restart: 'Server failed to restart!'

{serverwatcher-5.1.5 → serverwatcher-5.2.1}/src/serverwatcher/watcher.py

@@ -99,7 +99,7 @@ class ServerWatcher:
         self.say(self.messages.restart_action_sent)
         time.sleep(self.watcherconfig.restart_wait_seconds)
 
-        self.say(self.messages.log_status_check, level="warn")
+        self.say(self.messages.status_check, level="warn")
         alive = waitForOnline(
             self.server,
             timeout=self.watcherconfig.restart_timeout,
@@ -179,7 +179,7 @@ class ServerWatcher:
             )
             pro += self.watcherconfig.weight_uptime
 
-        if (snap.tps if snap.tps is not None else 0) <= self.watcherconfig.threshold_tps:
+        if (snap.tps if snap.tps is not None else 20) <= 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
 

{serverwatcher-5.1.5 → serverwatcher-5.2.1/src/serverwatcher.egg-info}/PKG-INFO

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

serverwatcher-5.1.5/src/serverwatcher/defaultconfigs/config.yaml

@@ -1,28 +0,0 @@
-watch_interval: 300
-
-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"
-
-logger:
-  enabled: True
-  name: "Server Watcher"
-  log_path: "/home/container/logs/"
-  timezone: "America/Chicago"
-
-terminal:
-  backspaces: 8
-  enable_clearing: True

serverwatcher-5.1.5/src/serverwatcher/defaultconfigs/messages.yaml

@@ -1,58 +0,0 @@
-prefix: "<aqua>[Server Watcher]"
-
-broadcast_restart_at: "{prefix} The server will restart at {time} CDT."
-bullet: "-"
-
-broadcast_minutes:
-  120: "{prefix} Restart in 2 hours!"
-  60: "{prefix} Restart in 1 hour!"
-  45: "{prefix} Restart in 45 minutes!"
-  30: "{prefix} Restart in 30 minutes!"
-  15: "{prefix} Restart in 15 minutes!"
-  5: "{prefix} Restart in 5 minutes!"
-  1: "{prefix} Restart in 1 minute!"
-
-broadcast_seconds:
-  10: "{prefix} Restart in 10 seconds!"
-  9: "{prefix} Restart in 9 seconds!"
-  8: "{prefix} Restart in 8 seconds!"
-  7: "{prefix} Restart in 7 seconds!"
-  6: "{prefix} Restart in 6 seconds!"
-  5: "{prefix} Restart in 5 seconds!"
-  4: "{prefix} Restart in 4 seconds!"
-  3: "{prefix} Restart in 3 seconds!"
-  2: "{prefix} Restart in 2 seconds!"
-  1: "{prefix} Restart in 1 second!"
-
-logging:
-  startup: "ServerWatcher is running!"
-  status_check: "Checking server status..."
-  validation_fail: "Validation FAILED."
-  validation_ok: "All validation checks succeeded."
-  shutdown: "Shutting down ServerWatcher."
-  immediate_restart: "Restarting immediately."
-  no_restart: "The server does not need to restart."
-  scheduled: "Restart needed, but anti-restart factors outweigh it."
-  gap_low: "Gap {gap}. Scheduling restart in 2 hours."
-  gap_high: "Gap {gap}. Scheduling restart in 1 hour."
-
-reasons:
-  pro_splash: "PRO-RESTART REASONS:"
-  anti_splash: "ANTI-RESTART REASONS:"
-
-  restart_soon: "The server is set to restart soon"
-  ram: "RAM usage ({ram}) is higher than {threshold} GB"
-  cpu: "CPU usage ({cpu}) is higher than {threshold}%"
-  uptime: "Uptime {uptime} exceeds {threshold}h"
-  tps: "TPS {tps} is lower than {threshold}"
-  low_uptime: "Uptime {uptime} is shorter than 30m"
-  players: "There {verb} {count} {plural} online"
-
-  pro_restart_number: "Pro-restart: "
-  anti_restart_number: "Anti-restart:"
-
-restarts:
-  restart_action_sent: "Restart action sent. Waiting..."
-  back_online: "Server is back online!"
-  back_online_broadcast: "{prefix} <green>Restart successful!"
-  failed_restart: "Server failed to restart!"