django/daphne
1
1
Fork 0
mirror of https://github.com/django/daphne.git synced 2025-07-04 03:43:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #18: Drop WebSocket connections on .connect backpressure

Browse Source
This commit is contained in:
Andrew Godwin 2016-07-06 11:41:01 -07:00
parent 9310094970
commit 0f1b0b85b6
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
daphne/ws_protocol.py
View File

@ -17,6 +17,9 @@ class WebSocketProtocol(WebSocketServerProtocol):
the websocket channels. the websocket channels.
""" """
# If we should send no more messages (e.g. we error-closed the socket)
muted = False
def set_main_factory(self, main_factory): def set_main_factory(self, main_factory):
self.main_factory = main_factory self.main_factory = main_factory
self.channel_layer = self.main_factory.channel_layer self.channel_layer = self.main_factory.channel_layer
@ -94,14 +97,21 @@ class WebSocketProtocol(WebSocketServerProtocol):
try: try:
self.channel_layer.send("websocket.connect", self.request_info) self.channel_layer.send("websocket.connect", self.request_info)
except self.channel_layer.ChannelFull: except self.channel_layer.ChannelFull:
# We don't drop the connection here as you don't _have_ to consume websocket.connect # You have to consume websocket.connect according to the spec,
pass # so drop the connection.
self.muted = True
logger.warn("WebSocket force closed for %s due to backpressure", self.reply_channel)
self.sendClose()
else:
self.factory.log_action("websocket", "connected", { self.factory.log_action("websocket", "connected", {
"path": self.request.path, "path": self.request.path,
"client": "%s:%s" % tuple(self.client_addr) if self.client_addr else None, "client": "%s:%s" % tuple(self.client_addr) if self.client_addr else None,
}) })
def onMessage(self, payload, isBinary): def onMessage(self, payload, isBinary):
# If we're muted, do nothing.
if self.muted:
return
logger.debug("WebSocket incoming packet on %s", self.reply_channel) logger.debug("WebSocket incoming packet on %s", self.reply_channel)
self.packets_received += 1 self.packets_received += 1
self.last_data = time.time() self.last_data = time.time()
@ -147,6 +157,7 @@ class WebSocketProtocol(WebSocketServerProtocol):
logger.debug("WebSocket closed for %s", self.reply_channel) logger.debug("WebSocket closed for %s", self.reply_channel)
del self.factory.reply_protocols[self.reply_channel] del self.factory.reply_protocols[self.reply_channel]
try: try:
if not self.muted:
self.channel_layer.send("websocket.disconnect", { self.channel_layer.send("websocket.disconnect", {
"reply_channel": self.reply_channel, "reply_channel": self.reply_channel,
"path": self.unquote(self.path), "path": self.unquote(self.path),