ash/BAPSicle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Fix exit hang on linux"

Browse source 
This reverts commit a838ef7621.
This commit is contained in:
Matthew Stratford 2022-03-19 17:22:42 +00:00
parent efd0273fea
commit 330a1dea5c
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
launch.py
View file

@ -2,7 +2,6 @@
import multiprocessing import multiprocessing
import time import time
import sys import sys
import os
from typing import Any from typing import Any
import webbrowser import webbrowser
from setproctitle import setproctitle from setproctitle import setproctitle
@ -32,14 +31,11 @@ def startServer(notifications=False):
printer("Server dead. Exiting.") printer("Server dead. Exiting.")
if notifications: if notifications:
notif("BAPSicle Server Stopped!") notif("BAPSicle Server Stopped!")
os._exit(0) sys.exit(0)
if server and server.is_alive(): if server and server.is_alive():
printer("Terminating server.")
server.terminate() server.terminate()
printer("Waiting to terminate.")
server.join(timeout=20) # If we somehow get stuck stopping BAPSicle let it die. server.join(timeout=20) # If we somehow get stuck stopping BAPSicle let it die.
printer("Terminated")
# Catch the handler being killed externally. # Catch the handler being killed externally.
except Exception as e: except Exception as e:
@ -84,10 +80,9 @@ if __name__ == "__main__":
type(e).__name__, e type(e).__name__, e
) )
) )
os._exit(1) sys.exit(1)
os._exit(0) sys.exit(0)
else: else:
startServer() startServer()
printer("Exiting.") sys.exit(0)
os._exit(0)