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

These fixed the exceptions that popped up for me when stopping the evennia process on Windows - believe it or not, the wholly redundant try/except block for printing the success message in evenna_launcher actually removed a traceback.. But since Windows seems incredibly finicky, it'd probably be a good idea to see if it breaks anything for someone else using Windows first.

Browse source
This commit is contained in:
Tehom 2016-11-24 04:11:49 -05:00 • committed by Griatch
parent 2578e6cbfc
commit f086433e83
2 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/server/evennia_launcher.py
View file

@ -732,6 +732,10 @@ def kill(pidfile, signal=SIG, succmsg="", errmsg="",
"The PID file 'server/%(pidfile)s' seems stale. "\ "The PID file 'server/%(pidfile)s' seems stale. "\
"Try removing it." % {'pid': pid, 'pidfile': pidfile}) "Try removing it." % {'pid': pid, 'pidfile': pidfile})
return return
try:
print("Evennia:", succmsg)
return
except KeyboardInterrupt:
print("Evennia:", succmsg) print("Evennia:", succmsg)
return return
print("Evennia:", errmsg) print("Evennia:", errmsg)

4
evennia/server/evennia_runner.py
View file

@ -185,6 +185,8 @@ 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.
from twisted.internet.error import ReactorNotRunning
try:
try: try:
message, rc = processes.get() message, rc = processes.get()
except KeyboardInterrupt: except KeyboardInterrupt:
@ -205,6 +207,8 @@ def start_services(server_argv, portal_argv):
PORTAL = thread.start_new_thread(portal_waiter, (processes, )) PORTAL = thread.start_new_thread(portal_waiter, (processes, ))
continue continue
break break
except ReactorNotRunning:
break
def main(): def main():