From c568e055f678539d2f83d62c736b9b2f581db333 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sat, 19 Sep 2020 00:19:37 +0200 Subject: [PATCH] Clean up the webclient/server error output. Resolve #2197 --- evennia/server/portal/webclient.py | 3 ++- evennia/server/webserver.py | 14 ++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/evennia/server/portal/webclient.py b/evennia/server/portal/webclient.py index d1981fa431..155599c7a0 100644 --- a/evennia/server/portal/webclient.py +++ b/evennia/server/portal/webclient.py @@ -40,6 +40,7 @@ CLOSE_NORMAL = WebSocketServerProtocol.CLOSE_STATUS_CODE_NORMAL # called when the browser is navigating away from the page GOING_AWAY = WebSocketServerProtocol.CLOSE_STATUS_CODE_GOING_AWAY +STATE_CLOSING = WebSocketServerProtocol.STATE_CLOSING class WebSocketClient(WebSocketServerProtocol, Session): """ @@ -151,7 +152,7 @@ class WebSocketClient(WebSocketServerProtocol, Session): # in case anyone wants to expose this functionality later. # # 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): """ diff --git a/evennia/server/webserver.py b/evennia/server/webserver.py index ff7f61baa0..c2b3cad014 100644 --- a/evennia/server/webserver.py +++ b/evennia/server/webserver.py @@ -102,7 +102,8 @@ class EvenniaReverseProxyResource(ReverseProxyResource): """ 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( self.host, self.port, self.path + "/" + urlquote(path, safe=""), self.reactor @@ -139,9 +140,9 @@ class EvenniaReverseProxyResource(ReverseProxyResource): clientFactory.noisy = False self.reactor.connectTCP(self.host, self.port, clientFactory) # don't trigger traceback if connection is lost before request finish. - request.notifyFinish().addErrback( - lambda f: logger.log_trace("%s\nCaught errback in webserver.py:75." % f) - ) + request.notifyFinish().addErrback(lambda f: 0) + # request.notifyFinish().addErrback( + # lambda f:logger.log_trace("Caught errback in webserver.py: %s" % f) return NOT_DONE_YET @@ -207,6 +208,11 @@ class DjangoWebRoot(resource.Resource): path0 = request.prepath.pop(0) 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() self._pending_requests[deferred] = deferred deferred.addBoth(self._decrement_requests, deferred=deferred)