RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-06 23:59:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved server subprocess launch failure error handling

Browse Source
This commit is contained in:
Eric Froemling 2021-03-01 17:28:55 -06:00
parent d251aee045
commit a09232daa1
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -583,17 +583,24 @@ class ServerManagerApp:
binary_name = ('ballisticacore_headless.exe' binary_name = ('ballisticacore_headless.exe'
if os.name == 'nt' else './ballisticacore_headless') if os.name == 'nt' else './ballisticacore_headless')
assert self._ba_root_path is not None assert self._ba_root_path is not None
self._subprocess = subprocess.Popen( self._subprocess = None
[binary_name, '-cfgdir', self._ba_root_path], try:
stdin=subprocess.PIPE, self._subprocess = subprocess.Popen(
cwd='dist') [binary_name, '-cfgdir', self._ba_root_path],
stdin=subprocess.PIPE,
cwd='dist')
except Exception as exc:
print(f'Error launching server subprocess: {exc}',
file=sys.stderr,
flush=True)
# Do the thing. # Do the thing.
# No matter how this ends up, make sure the process is dead after. # No matter how this ends up, make sure the process is dead after.
try: if self._subprocess is not None:
self._run_subprocess_until_exit() try:
finally: self._run_subprocess_until_exit()
self._kill_subprocess() finally:
self._kill_subprocess()
# If we want to die completely after this subprocess has ended, # If we want to die completely after this subprocess has ended,
# tell the main thread to die. # tell the main thread to die.