serverwatcher 5.17.6__tar.gz → 5.19__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.17.6/src/serverwatcher.egg-info → serverwatcher-5.19}/PKG-INFO +1 -1
- {serverwatcher-5.17.6 → serverwatcher-5.19}/pyproject.toml +1 -1
- {serverwatcher-5.17.6 → serverwatcher-5.19}/src/serverwatcher/defaultconfigs/config.yaml +3 -3
- {serverwatcher-5.17.6 → serverwatcher-5.19}/src/serverwatcher/defaultconfigs/messages.yaml +40 -0
- {serverwatcher-5.17.6 → serverwatcher-5.19}/src/serverwatcher/watcher.py +15 -10
- {serverwatcher-5.17.6 → serverwatcher-5.19/src/serverwatcher.egg-info}/PKG-INFO +1 -1
- {serverwatcher-5.17.6 → serverwatcher-5.19}/LICENSE +0 -0
- {serverwatcher-5.17.6 → serverwatcher-5.19}/README.md +0 -0
- {serverwatcher-5.17.6 → serverwatcher-5.19}/setup.cfg +0 -0
- {serverwatcher-5.17.6 → serverwatcher-5.19}/src/serverwatcher/__init__.py +0 -0
- {serverwatcher-5.17.6 → serverwatcher-5.19}/src/serverwatcher/__main__.py +0 -0
- {serverwatcher-5.17.6 → serverwatcher-5.19}/src/serverwatcher/configclasses/__init__.py +0 -0
- {serverwatcher-5.17.6 → serverwatcher-5.19}/src/serverwatcher/configclasses/config.py +0 -0
- {serverwatcher-5.17.6 → serverwatcher-5.19}/src/serverwatcher/configclasses/messages.py +0 -0
- {serverwatcher-5.17.6 → serverwatcher-5.19}/src/serverwatcher/configclasses/watcher.py +0 -0
- {serverwatcher-5.17.6 → serverwatcher-5.19}/src/serverwatcher/defaultconfigs/watcher.yaml +0 -0
- {serverwatcher-5.17.6 → serverwatcher-5.19}/src/serverwatcher/validator.py +0 -0
- {serverwatcher-5.17.6 → serverwatcher-5.19}/src/serverwatcher.egg-info/SOURCES.txt +0 -0
- {serverwatcher-5.17.6 → serverwatcher-5.19}/src/serverwatcher.egg-info/dependency_links.txt +0 -0
- {serverwatcher-5.17.6 → serverwatcher-5.19}/src/serverwatcher.egg-info/requires.txt +0 -0
- {serverwatcher-5.17.6 → serverwatcher-5.19}/src/serverwatcher.egg-info/top_level.txt +0 -0
|
@@ -25,9 +25,9 @@ logger:
|
|
|
25
25
|
log_path: '/home/container/logs/'
|
|
26
26
|
|
|
27
27
|
prefixes:
|
|
28
|
-
info: "<white>[INFO]: "
|
|
29
|
-
warn: "<yellow>[WARN]: "
|
|
30
|
-
error: "<red>[ERROR]: "
|
|
28
|
+
info: "<white>[%hh%:%mm%:%ss%] [INFO]: "
|
|
29
|
+
warn: "<yellow>[%hh%:%mm%:%ss%] [WARN]: "
|
|
30
|
+
error: "<red>[%hh%:%mm%:%ss%] [ERROR]: "
|
|
31
31
|
|
|
32
32
|
terminal:
|
|
33
33
|
enable_clearing: True
|
|
@@ -1,3 +1,43 @@
|
|
|
1
|
+
# ─────────────────────────────────────────────────────────────────────────────
|
|
2
|
+
# MAP USAGE GUIDE
|
|
3
|
+
# ─────────────────────────────────────────────────────────────────────────────
|
|
4
|
+
# The maps below provide different kinds of placeholders.
|
|
5
|
+
#
|
|
6
|
+
# 1. ColorMap (static)
|
|
7
|
+
# Provides color codes. Syntax: <color>
|
|
8
|
+
# Examples:
|
|
9
|
+
# <red> <green> <yellow> <reset>
|
|
10
|
+
#
|
|
11
|
+
# 2. GlobalConfig (config)
|
|
12
|
+
# Provides server-wide configuration values. Syntax: {field}
|
|
13
|
+
# Examples:
|
|
14
|
+
# {server_name}
|
|
15
|
+
# {panel_url}
|
|
16
|
+
#
|
|
17
|
+
# 3. MessagesConfig (keys)
|
|
18
|
+
# Provides message templates. Syntax: {field}
|
|
19
|
+
# Examples:
|
|
20
|
+
# {prefix}
|
|
21
|
+
# {broadcast_restart_at}
|
|
22
|
+
#
|
|
23
|
+
# 4. WatcherConfig (config)
|
|
24
|
+
# Provides thresholds, weights, and timing values. Syntax: {field}
|
|
25
|
+
# Examples:
|
|
26
|
+
# {threshold_ram}
|
|
27
|
+
# {low_gap_minutes}
|
|
28
|
+
#
|
|
29
|
+
# 5. TimeMap (dynamic)
|
|
30
|
+
# Provides live timestamps. Syntax: %field%
|
|
31
|
+
# Examples:
|
|
32
|
+
# %hh% hour (00–23)
|
|
33
|
+
# %mm% minute (00–59)
|
|
34
|
+
# %ss% second (00–59)
|
|
35
|
+
# %ms% millisecond (000–999)
|
|
36
|
+
# %YYYY% year
|
|
37
|
+
# %MM% month
|
|
38
|
+
# %DD% day
|
|
39
|
+
# %weekday%
|
|
40
|
+
|
|
1
41
|
prefix: '<aqua>[Server Watcher]'
|
|
2
42
|
bullet: '-'
|
|
3
43
|
|
|
@@ -18,9 +18,10 @@ class ServerWatcher:
|
|
|
18
18
|
|
|
19
19
|
datamap_api.setGlobalMaps(
|
|
20
20
|
utils.ASCII_COLOR_MAP,
|
|
21
|
+
utils.TIME_MAP(self.config.timezone),
|
|
21
22
|
self.config,
|
|
22
23
|
self.messages,
|
|
23
|
-
self.watcherconfig
|
|
24
|
+
self.watcherconfig,
|
|
24
25
|
)
|
|
25
26
|
|
|
26
27
|
self.panel = servers.Panel(
|
|
@@ -53,10 +54,11 @@ class ServerWatcher:
|
|
|
53
54
|
Servers=[self.server],
|
|
54
55
|
log_path=self.config.log_path,
|
|
55
56
|
|
|
56
|
-
origin_maps = [utils.ASCII_COLOR_MAP, self.config, self.messages, self.watcherconfig],
|
|
57
|
-
destination_maps = [utils.ASCII_COLOR_MAP, self.config, self.messages, self.watcherconfig],
|
|
58
|
-
broadcast_maps = [utils.MC_COLOR_MAP, self.config, self.messages, self.watcherconfig],
|
|
59
|
-
file_maps = [utils.STRIP_COLOR_MAP, self.config, self.messages, self.watcherconfig],
|
|
57
|
+
origin_maps = [utils.ASCII_COLOR_MAP, utils.TIME_MAP(self.config.timezone), self.config, self.messages, self.watcherconfig],
|
|
58
|
+
destination_maps = [utils.ASCII_COLOR_MAP, utils.TIME_MAP(self.config.timezone), self.config, self.messages, self.watcherconfig],
|
|
59
|
+
broadcast_maps = [utils.MC_COLOR_MAP, utils.TIME_MAP(self.config.timezone), self.config, self.messages, self.watcherconfig],
|
|
60
|
+
file_maps = [utils.STRIP_COLOR_MAP, utils.TIME_MAP(self.config.timezone), self.config, self.messages, self.watcherconfig],
|
|
61
|
+
prefix_maps = [utils.ASCII_COLOR_MAP, utils.TIME_MAP(self.config.timezone)],
|
|
60
62
|
|
|
61
63
|
info_prefix=self.config.info_prefix,
|
|
62
64
|
warn_prefix=self.config.warn_prefix,
|
|
@@ -211,10 +213,13 @@ class ServerWatcher:
|
|
|
211
213
|
self.restart_and_wait()
|
|
212
214
|
|
|
213
215
|
def run(self):
|
|
214
|
-
|
|
215
|
-
utils.clearTerminal()
|
|
216
|
-
while True:
|
|
216
|
+
try:
|
|
217
217
|
if self.config.clear_terminal:
|
|
218
218
|
utils.clearTerminal()
|
|
219
|
-
|
|
220
|
-
|
|
219
|
+
while True:
|
|
220
|
+
if self.config.clear_terminal:
|
|
221
|
+
utils.clearTerminal()
|
|
222
|
+
self.evaluate()
|
|
223
|
+
time.sleep(self.watcherconfig.watch_interval)
|
|
224
|
+
except KeyboardInterrupt:
|
|
225
|
+
self.shutdown()
|
|
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
|