serverwatcher 5.13__tar.gz → 5.14__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.13/src/serverwatcher.egg-info → serverwatcher-5.14}/PKG-INFO +1 -1
- {serverwatcher-5.13 → serverwatcher-5.14}/pyproject.toml +1 -1
- serverwatcher-5.14/src/serverwatcher/__main__.py +11 -0
- {serverwatcher-5.13 → serverwatcher-5.14}/src/serverwatcher/watcher.py +10 -18
- {serverwatcher-5.13 → serverwatcher-5.14/src/serverwatcher.egg-info}/PKG-INFO +1 -1
- serverwatcher-5.13/src/serverwatcher/__main__.py +0 -24
- {serverwatcher-5.13 → serverwatcher-5.14}/LICENSE +0 -0
- {serverwatcher-5.13 → serverwatcher-5.14}/README.md +0 -0
- {serverwatcher-5.13 → serverwatcher-5.14}/setup.cfg +0 -0
- {serverwatcher-5.13 → serverwatcher-5.14}/src/serverwatcher/__init__.py +0 -0
- {serverwatcher-5.13 → serverwatcher-5.14}/src/serverwatcher/configclasses/__init__.py +0 -0
- {serverwatcher-5.13 → serverwatcher-5.14}/src/serverwatcher/configclasses/config.py +0 -0
- {serverwatcher-5.13 → serverwatcher-5.14}/src/serverwatcher/configclasses/messages.py +0 -0
- {serverwatcher-5.13 → serverwatcher-5.14}/src/serverwatcher/configclasses/watcher.py +0 -0
- {serverwatcher-5.13 → serverwatcher-5.14}/src/serverwatcher/defaultconfigs/config.yaml +0 -0
- {serverwatcher-5.13 → serverwatcher-5.14}/src/serverwatcher/defaultconfigs/messages.yaml +0 -0
- {serverwatcher-5.13 → serverwatcher-5.14}/src/serverwatcher/defaultconfigs/watcher.yaml +0 -0
- {serverwatcher-5.13 → serverwatcher-5.14}/src/serverwatcher/validator.py +0 -0
- {serverwatcher-5.13 → serverwatcher-5.14}/src/serverwatcher.egg-info/SOURCES.txt +0 -0
- {serverwatcher-5.13 → serverwatcher-5.14}/src/serverwatcher.egg-info/dependency_links.txt +0 -0
- {serverwatcher-5.13 → serverwatcher-5.14}/src/serverwatcher.egg-info/requires.txt +0 -0
- {serverwatcher-5.13 → serverwatcher-5.14}/src/serverwatcher.egg-info/top_level.txt +0 -0
|
@@ -30,7 +30,7 @@ class ServerWatcher:
|
|
|
30
30
|
WatcherConfig
|
|
31
31
|
)
|
|
32
32
|
|
|
33
|
-
datamap_api.
|
|
33
|
+
datamap_api.setGlobalMaps(
|
|
34
34
|
utils.ASCII_COLOR_MAP,
|
|
35
35
|
self.config,
|
|
36
36
|
self.messages,
|
|
@@ -67,6 +67,11 @@ class ServerWatcher:
|
|
|
67
67
|
Servers=[self.server],
|
|
68
68
|
log_path=self.config.log_path,
|
|
69
69
|
|
|
70
|
+
origin_maps = [utils.ASCII_COLOR_MAP],
|
|
71
|
+
destination_maps = [utils.ASCII_COLOR_MAP],
|
|
72
|
+
broadcast_maps = [utils.MC_COLOR_MAP],
|
|
73
|
+
file_maps = [utils.STRIP_COLOR_MAP],
|
|
74
|
+
|
|
70
75
|
info_prefix=self.messages.info_prefix,
|
|
71
76
|
warn_prefix=self.messages.warn_prefix,
|
|
72
77
|
error_prefix=self.messages.error_prefix,
|
|
@@ -95,13 +100,7 @@ class ServerWatcher:
|
|
|
95
100
|
|
|
96
101
|
if alive:
|
|
97
102
|
self.router.info(self.messages.server_back_online)
|
|
98
|
-
self.router.broadcast(
|
|
99
|
-
mapit(
|
|
100
|
-
self.messages.server_back_online_broadcast,
|
|
101
|
-
enable=[utils.MC_COLOR_MAP],
|
|
102
|
-
disable=[utils.ASCII_COLOR_MAP]
|
|
103
|
-
)
|
|
104
|
-
)
|
|
103
|
+
self.router.broadcast(self.messages.server_back_online_broadcast)
|
|
105
104
|
else:
|
|
106
105
|
self.router.error(self.messages.server_failed_restart)
|
|
107
106
|
|
|
@@ -112,18 +111,11 @@ class ServerWatcher:
|
|
|
112
111
|
local_time = scheduled.astimezone(self.tz)
|
|
113
112
|
time_str = local_time.strftime("%I:%M %p")
|
|
114
113
|
|
|
115
|
-
self.router.broadcast(
|
|
116
|
-
mapit(
|
|
117
|
-
self.messages.broadcast_restart_at,
|
|
118
|
-
time=time_str,
|
|
119
|
-
enable=[utils.MC_COLOR_MAP],
|
|
120
|
-
disable=[utils.ASCII_COLOR_MAP]
|
|
121
|
-
)
|
|
122
|
-
)
|
|
114
|
+
self.router.broadcast(self.messages.broadcast_restart_at, time=time_str)
|
|
123
115
|
|
|
124
116
|
minute_callbacks = {
|
|
125
117
|
int(k.split("_")[1]): (
|
|
126
|
-
lambda msg=
|
|
118
|
+
lambda msg=getattr(self.messages, k):
|
|
127
119
|
self.router.broadcast(msg)
|
|
128
120
|
)
|
|
129
121
|
for k in vars(self.messages)
|
|
@@ -132,7 +124,7 @@ class ServerWatcher:
|
|
|
132
124
|
|
|
133
125
|
second_callbacks = {
|
|
134
126
|
int(k.split("_")[1]): (
|
|
135
|
-
lambda msg=
|
|
127
|
+
lambda msg=getattr(self.messages, k):
|
|
136
128
|
self.router.broadcast(msg)
|
|
137
129
|
)
|
|
138
130
|
for k in vars(self.messages)
|
|
@@ -1,24 +0,0 @@
|
|
|
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()
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|