serverwatcher 5.8.dev34__tar.gz → 5.8.1__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.8.dev34/src/serverwatcher.egg-info → serverwatcher-5.8.1}/PKG-INFO +1 -1
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/pyproject.toml +1 -1
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/src/serverwatcher/validator.py +4 -4
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/src/serverwatcher/watcher.py +1 -1
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1/src/serverwatcher.egg-info}/PKG-INFO +1 -1
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/LICENSE +0 -0
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/README.md +0 -0
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/setup.cfg +0 -0
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/src/serverwatcher/__init__.py +0 -0
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/src/serverwatcher/configclasses/__init__.py +0 -0
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/src/serverwatcher/configclasses/config.py +0 -0
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/src/serverwatcher/configclasses/messages.py +0 -0
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/src/serverwatcher/configclasses/watcher.py +0 -0
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/src/serverwatcher/defaultconfigs/config.yaml +0 -0
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/src/serverwatcher/defaultconfigs/messages.yaml +0 -0
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/src/serverwatcher/defaultconfigs/watcher.yaml +0 -0
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/src/serverwatcher.egg-info/SOURCES.txt +0 -0
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/src/serverwatcher.egg-info/dependency_links.txt +0 -0
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/src/serverwatcher.egg-info/requires.txt +0 -0
- {serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/src/serverwatcher.egg-info/top_level.txt +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import sys
|
|
2
2
|
from dataclasses import fields
|
|
3
|
-
from hungerlib import utils
|
|
3
|
+
from hungerlib import utils, loadConfig
|
|
4
4
|
|
|
5
5
|
from serverwatcher.configclasses.config import GlobalConfig
|
|
6
6
|
from serverwatcher.configclasses.messages import MessagesConfig
|
|
@@ -96,9 +96,9 @@ def validate_all():
|
|
|
96
96
|
errors = []
|
|
97
97
|
defaults = []
|
|
98
98
|
|
|
99
|
-
config =
|
|
100
|
-
messages =
|
|
101
|
-
watcher =
|
|
99
|
+
config = loadConfig("config/config.yaml", "/defaultconfigs/config.yaml", GlobalConfig)
|
|
100
|
+
messages = loadConfig("config/messages.yaml", "/defaultconfigs/messages.yaml", MessagesConfig)
|
|
101
|
+
watcher = loadConfig("config/watcher.yaml", "/defaultconfigs/watcher.yaml", WatcherConfig)
|
|
102
102
|
|
|
103
103
|
validate_dataclass(config, GlobalConfig, errors)
|
|
104
104
|
validate_dataclass(messages, MessagesConfig, errors)
|
|
@@ -114,7 +114,7 @@ class ServerWatcher:
|
|
|
114
114
|
self.say(self.messages.server_failed_restart, level="error")
|
|
115
115
|
|
|
116
116
|
def schedule_restart(self, minutes):
|
|
117
|
-
info = snapSchedule(minimumMinutes=minutes)
|
|
117
|
+
info = utils.snapSchedule(minimumMinutes=minutes)
|
|
118
118
|
scheduled = info["scheduled"]
|
|
119
119
|
|
|
120
120
|
local_time = scheduled.astimezone(self.tz)
|
|
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.8.dev34 → serverwatcher-5.8.1}/src/serverwatcher/defaultconfigs/config.yaml
RENAMED
|
File without changes
|
{serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/src/serverwatcher/defaultconfigs/messages.yaml
RENAMED
|
File without changes
|
{serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/src/serverwatcher/defaultconfigs/watcher.yaml
RENAMED
|
File without changes
|
|
File without changes
|
{serverwatcher-5.8.dev34 → serverwatcher-5.8.1}/src/serverwatcher.egg-info/dependency_links.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|