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

Add extra checking for additional requests made while we were in the process of stopping reactor, change from callLater to deferLater to be compliant with inlinecallbacks.

Browse source
This commit is contained in:
Tehom 2017-05-31 07:14:25 -04:00
parent 4b5ee77292
commit 96ab620618
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
evennia/server/server.py
View file

@ -397,8 +397,15 @@ class Evennia(object):
# this will also send a reactor.stop signal, so we set a # this will also send a reactor.stop signal, so we set a
# flag to avoid loops. # flag to avoid loops.
self.shutdown_complete = True self.shutdown_complete = True
# kill the server if WEBSERVER_ENABLED:
reactor.callLater(1, reactor.stop) # Just to be extra sure, get all pending requests that might have occurred after we started
d = self.web_root.get_pending_requests()
d.addCallback(lambda _: reactor.stop())
from twisted.internet import task
yield task.deferLater(reactor, 1, d.callback, None)
else:
# kill the server
reactor.callLater(1, reactor.stop)
# we make sure the proper gametime is saved as late as possible # we make sure the proper gametime is saved as late as possible
ServerConfig.objects.conf("runtime", _GAMETIME_MODULE.runtime()) ServerConfig.objects.conf("runtime", _GAMETIME_MODULE.runtime())