serverwatcher 5.9.dev14__tar.gz → 5.9.dev15__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {serverwatcher-5.9.dev14/src/serverwatcher.egg-info → serverwatcher-5.9.dev15}/PKG-INFO +1 -1
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/pyproject.toml +1 -1
- serverwatcher-5.9.dev15/src/serverwatcher/__main__.py +24 -0
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher/configclasses/messages.py +0 -1
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher/defaultconfigs/messages.yaml +0 -1
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher/validator.py +2 -2
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher/watcher.py +1 -3
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15/src/serverwatcher.egg-info}/PKG-INFO +1 -1
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher.egg-info/SOURCES.txt +1 -0
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/LICENSE +0 -0
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/README.md +0 -0
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/setup.cfg +0 -0
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher/__init__.py +0 -0
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher/configclasses/__init__.py +0 -0
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher/configclasses/config.py +0 -0
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher/configclasses/watcher.py +0 -0
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher/defaultconfigs/config.yaml +0 -0
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher/defaultconfigs/watcher.yaml +0 -0
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher.egg-info/dependency_links.txt +0 -0
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher.egg-info/requires.txt +0 -0
- {serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher.egg-info/top_level.txt +0 -0
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
# serverwatcher/__main__.py
|
|
2
|
+
|
|
3
|
+
import argparse
|
|
4
|
+
from .watcher import ServerWatcher
|
|
5
|
+
from serverwatcher.validator import validate_all
|
|
6
|
+
|
|
7
|
+
def main():
|
|
8
|
+
parser = argparse.ArgumentParser()
|
|
9
|
+
parser.add_argument("--init", action="store_true")
|
|
10
|
+
args = parser.parse_args()
|
|
11
|
+
|
|
12
|
+
if args.init:
|
|
13
|
+
# Create default configs
|
|
14
|
+
from .initializer import initialize
|
|
15
|
+
initialize()
|
|
16
|
+
return
|
|
17
|
+
|
|
18
|
+
validate_all()
|
|
19
|
+
|
|
20
|
+
watcher = ServerWatcher()
|
|
21
|
+
watcher.run()
|
|
22
|
+
|
|
23
|
+
if __name__ == "__main__":
|
|
24
|
+
main()
|
{serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher/configclasses/messages.py
RENAMED
|
@@ -26,7 +26,6 @@ class MessagesConfig:
|
|
|
26
26
|
second_2: str = "broadcast_seconds.2"
|
|
27
27
|
second_1: str = "broadcast_seconds.1"
|
|
28
28
|
|
|
29
|
-
startup: str = "logging.startup"
|
|
30
29
|
status_check: str = "logging.status_check"
|
|
31
30
|
validation_fail: str = "logging.validation_fail"
|
|
32
31
|
validation_ok: str = "logging.validation_ok"
|
|
@@ -47,8 +47,8 @@ def validate_global_config(config, errors):
|
|
|
47
47
|
if config.server_port <= 0 or config.server_port > 65535:
|
|
48
48
|
errors.append(f"server_port: must be 1–65535 (got {config.server_port})")
|
|
49
49
|
|
|
50
|
-
if config.
|
|
51
|
-
errors.append(f"
|
|
50
|
+
if config.bridge_port <= 0 or config.rcon_port > 65535:
|
|
51
|
+
errors.append(f"bridge_port: must be 1–65535 (got {config.bridge_port})")
|
|
52
52
|
|
|
53
53
|
def validate_watcher_config(watcherconfig, errors):
|
|
54
54
|
if watcherconfig.restart_wait_seconds < 1:
|
|
@@ -7,9 +7,7 @@ from hungerlib import servers, MessageRouter, loadConfig, utils, datamap_api, ma
|
|
|
7
7
|
from serverwatcher.configclasses.config import GlobalConfig
|
|
8
8
|
from serverwatcher.configclasses.messages import MessagesConfig
|
|
9
9
|
from serverwatcher.configclasses.watcher import WatcherConfig
|
|
10
|
-
from serverwatcher.validator import validate_all
|
|
11
10
|
|
|
12
|
-
validate_all()
|
|
13
11
|
|
|
14
12
|
|
|
15
13
|
class ServerWatcher:
|
|
@@ -158,7 +156,7 @@ class ServerWatcher:
|
|
|
158
156
|
)
|
|
159
157
|
|
|
160
158
|
def evaluate(self):
|
|
161
|
-
self.say(
|
|
159
|
+
self.say("ServerWatcher is running!")
|
|
162
160
|
|
|
163
161
|
if not utils.validateAll(self.panel, self.server):
|
|
164
162
|
self.say(self.messages.validation_fail, level="error")
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher/configclasses/__init__.py
RENAMED
|
File without changes
|
{serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher/configclasses/config.py
RENAMED
|
File without changes
|
{serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher/configclasses/watcher.py
RENAMED
|
File without changes
|
{serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher/defaultconfigs/config.yaml
RENAMED
|
File without changes
|
{serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher/defaultconfigs/watcher.yaml
RENAMED
|
File without changes
|
{serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher.egg-info/dependency_links.txt
RENAMED
|
File without changes
|
|
File without changes
|
{serverwatcher-5.9.dev14 → serverwatcher-5.9.dev15}/src/serverwatcher.egg-info/top_level.txt
RENAMED
|
File without changes
|