RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-01-28 01:43:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleaned up config file handling

Browse Source
This commit is contained in:
Eric Froemling 2021-02-25 15:04:57 -06:00
parent 2112db7bfe
commit 7587e0cd29
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
assets/src/server/ballisticacore_server.py
View File

@ -68,6 +68,7 @@ class ServerManagerApp:
def __init__(self) -> None:
self._config_path = 'config.yaml'
self._user_provided_config_path = False
self._config = ServerConfig()
self._ba_root_path = os.path.abspath('dist/ba_root')
self._interactive = sys.stdin.isatty()
@ -337,6 +338,7 @@ class ServerManagerApp:
# We need an abs path because we may be in a different
# cwd currently than we will be during the run.
self._config_path = os.path.abspath(path)
self._user_provided_config_path = True
i += 2
elif arg == '--root':
if i + 1 >= argc:
@ -472,6 +474,21 @@ class ServerManagerApp:
out: Optional[ServerConfig] = None
if not os.path.exists(self._config_path):
# Special case:
# If the user didn't specify a particular config file, allow
# gracefully falling back to defaults if the default one is
# missing.
if not self._user_provided_config_path:
if print_confirmation:
print(f'{Clr.CYN}Default config file not found'
f' (\'{self._config_path}\'); using default'
f' settings.{Clr.RST}')
self._config_mtime = None
self._last_config_mtime_check_time = time.time()
return ServerConfig()
# Don't be so lenient if the user pointed us at one though.
raise RuntimeError(
f"Config file not found: '{self._config_path}'.")