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

tidying

Browse Source
This commit is contained in:
Eric Froemling 2020-04-29 12:34:35 -07:00
parent 9abc244f6b
commit 6042f292c4
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
assets/src/server/server.py
View File

@ -192,25 +192,11 @@ class ServerManagerApp:
# Set an environment var so the server process knows its being # Set an environment var so the server process knows its being
# run under us. This causes it to ignore ctrl-c presses and other # run under us. This causes it to ignore ctrl-c presses and other
# slight behavior tweaks. # slight behavior tweaks. Hmm; should this be an argument instead?
os.environ['BA_SERVER_WRAPPER_MANAGED'] = '1' os.environ['BA_SERVER_WRAPPER_MANAGED'] = '1'
# We don't want our subprocess to respond to Ctrl-C; we want to handle self._process = subprocess.Popen(
# that ourself. So we need to do a bit of magic to accomplish that. [self._binary_path, '-cfgdir', 'ba_root'], stdin=subprocess.PIPE)
# FIXME: should just have the server itself handle that
args = [self._binary_path, '-cfgdir', 'ba_root']
if sys.platform.startswith('win'):
# https://msdn.microsoft.com/en-us/library/windows/
# desktop/ms684863(v=vs.85).aspx
# CREATE_NEW_PROCESS_GROUP=0x00000200 -> If this flag is
# specified, CTRL+C signals will be disabled
self._process = subprocess.Popen(
args,
stdin=subprocess.PIPE,
# creationflags=0x00000200
)
else:
self._process = subprocess.Popen(args, stdin=subprocess.PIPE)
# Set quit to True any time after launching the server # Set quit to True any time after launching the server
# to gracefully quit it at the next clean opportunity # to gracefully quit it at the next clean opportunity
@ -225,11 +211,6 @@ class ServerManagerApp:
finally: finally:
self._kill_process() self._kill_process()
# def _subprocess_pre_exec(self) -> None:
# """To ignore CTRL+C signal in the new process."""
# import signal
# signal.signal(signal.SIGINT, signal.SIG_IGN)
def _prep_process_environment(self) -> None: def _prep_process_environment(self) -> None:
"""Write files that must exist at process launch.""" """Write files that must exist at process launch."""
os.makedirs('ba_root', exist_ok=True) os.makedirs('ba_root', exist_ok=True)