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

Add support for cmdline reloading when requests are blocked.

Browse source
This commit is contained in:
Griatch 2017-06-04 00:35:55 +02:00
parent 00f71667ba
commit d73a2876cf
2 changed files with 27 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
evennia/server/webserver.py
View file

@ -149,12 +149,13 @@ class DjangoWebRoot(resource.Resource):
pool (ThreadPool): The twisted threadpool.
"""
self._pool = pool
self.pool = pool
self._echo_log = True
self._pending_requests = {}
resource.Resource.__init__(self)
self.wsgi_resource = WSGIResource(reactor, pool, WSGIHandler())
def get_pending_requests(self):
def empty_threadpool(self):
"""
Converts our _pending_requests list of deferreds into a DeferredList
@ -162,6 +163,11 @@ class DjangoWebRoot(resource.Resource):
deflist (DeferredList): Contains all deferreds of pending requests.
"""
self.pool.lock()
if self._pending_requests and self._echo_log:
self._echo_log = False # just to avoid multiple echoes
msg = "Webserver waiting for %i requests ... "
logger.log_info(msg % len(self._pending_requests))
return defer.DeferredList(self._pending_requests, consumeErrors=True)
def _decrement_requests(self, *args, **kwargs):