Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add kill signal handling to launcher

Browse source
This commit is contained in:
Griatch 2018-01-18 21:02:24 +01:00
parent 958071d3cc
commit 3a7b7ab4c0
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
evennia/server/evennia_launcher.py
View file

@ -1212,7 +1212,7 @@ def del_pid(pidfile):
os.remove(pidfile) os.remove(pidfile)
def kill(pidfile, killsignal=SIG, succmsg="", errmsg=""): def kill(pidfile, component='Server', killsignal=SIG):
""" """
Send a kill signal to a process based on PID. A customized Send a kill signal to a process based on PID. A customized
success/error message will be returned. If clean=True, the system success/error message will be returned. If clean=True, the system
@ -1220,9 +1220,8 @@ def kill(pidfile, killsignal=SIG, succmsg="", errmsg=""):
Args: Args:
pidfile (str): The path of the pidfile to get the PID from. pidfile (str): The path of the pidfile to get the PID from.
component (str, optional): Usually one of 'Server' or 'Portal'.
killsignal (int, optional): Signal identifier for signal to send. killsignal (int, optional): Signal identifier for signal to send.
succmsg (str, optional): Message to log on success.
errmsg (str, optional): Message to log on failure.
""" """
pid = get_pid(pidfile) pid = get_pid(pidfile)
@ -1247,13 +1246,15 @@ def kill(pidfile, killsignal=SIG, succmsg="", errmsg=""):
os.kill(int(pid), killsignal) os.kill(int(pid), killsignal)
except OSError: except OSError:
print("Process %(pid)s cannot be stopped. " print("{component} ({pid}) cannot be stopped. "
"The PID file 'server/%(pidfile)s' seems stale. " "The PID file '{pidfile}' seems stale. "
"Try removing it." % {'pid': pid, 'pidfile': pidfile}) "Try removing it manually.".format(
component=component, pid=pid, pidfile=pidfile))
return return
print("Evennia:", succmsg) print("Sent kill signal to {component}.".format(component=component))
return return
print("Evennia:", errmsg) print("Could not send kill signal - {component} does "
"not appear to be running.".format(component=component))
def show_version_info(about=False): def show_version_info(about=False):
@ -1669,7 +1670,7 @@ def main():
# launch menu for operation # launch menu for operation
init_game_directory(CURRENT_DIR, check_db=True) init_game_directory(CURRENT_DIR, check_db=True)
run_menu() run_menu()
elif option in ('status', 'info', 'start', 'reload', 'reset', 'stop', 'sstop'): elif option in ('status', 'info', 'start', 'reload', 'reset', 'stop', 'sstop', 'kill', 'skill'):
# operate the server directly # operate the server directly
init_game_directory(CURRENT_DIR, check_db=True) init_game_directory(CURRENT_DIR, check_db=True)
if option == "status": if option == "status":
@ -1686,6 +1687,11 @@ def main():
stop_evennia() stop_evennia()
elif option == 'sstop': elif option == 'sstop':
stop_server_only() stop_server_only()
elif option == 'kill':
kill(PORTAL_PIDFILE, 'Portal')
kill(SERVER_PIDFILE, 'Server')
elif option == 'skill':
kill(SERVER_PIDFILE, 'Server')
elif option != "noop": elif option != "noop":
# pass-through to django manager # pass-through to django manager
check_db = False check_db = False