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

Reworked interactive mode, on the way to fixing #803.

Browse source
This commit is contained in:
Griatch 2015-09-07 23:39:53 +02:00
parent a9480f9f64
commit f1834dc194
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
evennia/server/evennia_launcher.py
View file

@ -1034,8 +1034,13 @@ def server_operation(mode, service, interactive, profiler):
PORTAL_LOGFILE, HTTP_LOGFILE]) PORTAL_LOGFILE, HTTP_LOGFILE])
# start the server # start the server
process = Popen(cmdstr, env=getenv()) process = Popen(cmdstr, env=getenv())
if interactive: if interactive:
process.wait() try:
process.wait()
except KeyboardInterrupt:
print "\nKeyboard interrupt sent in interactive mode.\n"
elif mode == 'reload': elif mode == 'reload':
# restarting services # restarting services

5
evennia/server/evennia_runner.py
View file

@ -184,7 +184,10 @@ def start_services(server_argv, portal_argv):
while True: while True:
# this blocks until something is actually returned. # this blocks until something is actually returned.
message, rc = processes.get() try:
message, rc = processes.get()
except KeyboardInterrupt:
break
# restart only if process stopped cleanly # restart only if process stopped cleanly
if (message == "server_stopped" and int(rc) == 0 and if (message == "server_stopped" and int(rc) == 0 and