serverwatcher 5.30.2__tar.gz → 5.30.4__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.30.2/src/serverwatcher.egg-info → serverwatcher-5.30.4}/PKG-INFO +1 -1
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/pyproject.toml +1 -1
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/src/serverwatcher/watcher.py +9 -4
- {serverwatcher-5.30.2 → serverwatcher-5.30.4/src/serverwatcher.egg-info}/PKG-INFO +1 -1
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/LICENSE +0 -0
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/README.md +0 -0
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/setup.cfg +0 -0
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/src/serverwatcher/__init__.py +0 -0
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/src/serverwatcher/__main__.py +0 -0
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/src/serverwatcher/configclasses/__init__.py +0 -0
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/src/serverwatcher/configclasses/config.py +0 -0
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/src/serverwatcher/configclasses/messages.py +0 -0
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/src/serverwatcher/configclasses/watcher.py +0 -0
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/src/serverwatcher/defaultconfigs/config.yaml +0 -0
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/src/serverwatcher/defaultconfigs/messages.yaml +0 -0
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/src/serverwatcher/defaultconfigs/watcher.yaml +0 -0
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/src/serverwatcher/validator.py +0 -0
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/src/serverwatcher.egg-info/SOURCES.txt +0 -0
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/src/serverwatcher.egg-info/dependency_links.txt +0 -0
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/src/serverwatcher.egg-info/requires.txt +0 -0
- {serverwatcher-5.30.2 → serverwatcher-5.30.4}/src/serverwatcher.egg-info/top_level.txt +0 -0
|
@@ -137,12 +137,12 @@ class ServerWatcher:
|
|
|
137
137
|
# minute message generator
|
|
138
138
|
def minute_msg(n):
|
|
139
139
|
raw = self.messages.minute_template
|
|
140
|
-
return self.res(raw, n=n, s=plural(n))
|
|
140
|
+
return self.res(raw, n=n, s=plural(n), prefix=self.messages.prefix)
|
|
141
141
|
|
|
142
142
|
# second message generator
|
|
143
143
|
def second_msg(n):
|
|
144
144
|
raw = self.messages.second_template
|
|
145
|
-
return self.res(raw, n=n, s=plural(n))
|
|
145
|
+
return self.res(raw, n=n, s=plural(n), prefix=self.messages.prefix)
|
|
146
146
|
|
|
147
147
|
# minute callbacks using template
|
|
148
148
|
minute_callbacks = {
|
|
@@ -174,9 +174,14 @@ class ServerWatcher:
|
|
|
174
174
|
|
|
175
175
|
self.router.info(self.messages.startup)
|
|
176
176
|
|
|
177
|
-
|
|
177
|
+
# retry validation 5 times
|
|
178
|
+
for i in range(5):
|
|
179
|
+
if utils.validateAll(self.panel, self.server):
|
|
180
|
+
break
|
|
181
|
+
time.sleep(2)
|
|
182
|
+
else:
|
|
178
183
|
self.router.error(self.messages.validation_fail)
|
|
179
|
-
|
|
184
|
+
return
|
|
180
185
|
|
|
181
186
|
sample_duration_formatted = int(self.watcherconfig.sample_duration) if self.watcherconfig.sample_duration.is_integer() else self.watcherconfig.sample_duration
|
|
182
187
|
self.router.info(self.messages.sampling_start, duration=sample_duration_formatted)
|
|
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
|
{serverwatcher-5.30.2 → serverwatcher-5.30.4}/src/serverwatcher/defaultconfigs/messages.yaml
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{serverwatcher-5.30.2 → serverwatcher-5.30.4}/src/serverwatcher.egg-info/dependency_links.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|