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

Clean up the webclient/server error output. Resolve #2197

Browse source
This commit is contained in:
Griatch 2020-09-19 00:19:37 +02:00
parent 9837246568
commit c568e055f6
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
evennia/server/portal/webclient.py
View file

@ -40,6 +40,7 @@ CLOSE_NORMAL = WebSocketServerProtocol.CLOSE_STATUS_CODE_NORMAL
# called when the browser is navigating away from the page # called when the browser is navigating away from the page
GOING_AWAY = WebSocketServerProtocol.CLOSE_STATUS_CODE_GOING_AWAY GOING_AWAY = WebSocketServerProtocol.CLOSE_STATUS_CODE_GOING_AWAY
STATE_CLOSING = WebSocketServerProtocol.STATE_CLOSING
class WebSocketClient(WebSocketServerProtocol, Session): class WebSocketClient(WebSocketServerProtocol, Session):
""" """
@ -151,7 +152,7 @@ class WebSocketClient(WebSocketServerProtocol, Session):
# in case anyone wants to expose this functionality later. # in case anyone wants to expose this functionality later.
# #
# sendClose() under autobahn/websocket/interfaces.py # sendClose() under autobahn/websocket/interfaces.py
self.sendClose(CLOSE_NORMAL, reason) ret = self.sendClose(CLOSE_NORMAL, reason)
def onClose(self, wasClean, code=None, reason=None): def onClose(self, wasClean, code=None, reason=None):
""" """

14
evennia/server/webserver.py
View file

@ -102,7 +102,8 @@ class EvenniaReverseProxyResource(ReverseProxyResource):
""" """
request.notifyFinish().addErrback( request.notifyFinish().addErrback(
lambda f: logger.log_trace("%s\nCaught errback in webserver.py:75." % f) lambda f: 0
# lambda f: logger.log_trace("%s\nCaught errback in webserver.py" % f)
) )
return EvenniaReverseProxyResource( return EvenniaReverseProxyResource(
self.host, self.port, self.path + "/" + urlquote(path, safe=""), self.reactor self.host, self.port, self.path + "/" + urlquote(path, safe=""), self.reactor
@ -139,9 +140,9 @@ class EvenniaReverseProxyResource(ReverseProxyResource):
clientFactory.noisy = False clientFactory.noisy = False
self.reactor.connectTCP(self.host, self.port, clientFactory) self.reactor.connectTCP(self.host, self.port, clientFactory)
# don't trigger traceback if connection is lost before request finish. # don't trigger traceback if connection is lost before request finish.
request.notifyFinish().addErrback( request.notifyFinish().addErrback(lambda f: 0)
lambda f: logger.log_trace("%s\nCaught errback in webserver.py:75." % f) # request.notifyFinish().addErrback(
) # lambda f:logger.log_trace("Caught errback in webserver.py: %s" % f)
return NOT_DONE_YET return NOT_DONE_YET
@ -207,6 +208,11 @@ class DjangoWebRoot(resource.Resource):
path0 = request.prepath.pop(0) path0 = request.prepath.pop(0)
request.postpath.insert(0, path0) request.postpath.insert(0, path0)
request.notifyFinish().addErrback(
lambda f: 0
# lambda f: logger.log_trace("%s\nCaught errback in webserver.py:" % f)
)
deferred = request.notifyFinish() deferred = request.notifyFinish()
self._pending_requests[deferred] = deferred self._pending_requests[deferred] = deferred
deferred.addBoth(self._decrement_requests, deferred=deferred) deferred.addBoth(self._decrement_requests, deferred=deferred)