Respond with a code when closing a connection

Regards django/channels#414
This commit is contained in:
Tobias Kunze 2016-11-05 12:27:16 +01:00
parent 3c8c21b352
commit c6e4ea25d1
2 changed files with 8 additions and 6 deletions

View File

@ -265,7 +265,6 @@ class WebRequest(http.Request):
})
class HTTPProtocol(http.HTTPChannel):
requestFactory = WebRequest
@ -323,11 +322,13 @@ class HTTPFactory(http.HTTPFactory):
protocol.serverSend(message["bytes"], True)
if message.get("text", None):
protocol.serverSend(message["text"], False)
if message.get("close", False):
closing_code = message.get("close", False)
if closing_code:
if protocol.state == protocol.STATE_CONNECTING:
protocol.serverReject()
else:
protocol.serverClose()
protocol.serverClose(code=closing_code)
else:
raise ValueError("Cannot dispatch message on channel %r" % channel)

View File

@ -94,7 +94,7 @@ class WebSocketProtocol(WebSocketServerProtocol):
# so drop the connection.
self.muted = True
logger.warn("WebSocket force closed for %s due to connect backpressure", self.reply_channel)
# Send code 1013 "try again later" with close.
# Send code 503 "Service Unavailable" with close.
raise ConnectionDeny(code=503, reason="Connection queue at capacity")
else:
self.factory.log_action("websocket", "connecting", {
@ -187,11 +187,12 @@ class WebSocketProtocol(WebSocketServerProtocol):
else:
self.sendMessage(content.encode("utf8"), binary)
def serverClose(self):
def serverClose(self, code=True):
"""
Server-side channel message to close the socket
"""
self.sendClose()
code = 1000 if code is True else code
self.sendClose(code=code)
def onClose(self, wasClean, code, reason):
self.cleanup()