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

Fix for session shenanigans with WebsocketDemultiplexer (#486)

Browse Source 
* Fix for session shenanigans with WebsocketDemultiplexer

Session data was getting lost in the demux due to the session getting
saved after only the first connect/disconnect consumer was run.

* fix for flake8

* flake8 again

flake8 again
This commit is contained in:
Joseph Ryan 2017-01-17 16:20:08 -08:00 committed by Andrew Godwin
parent 335cd1625e
commit 1e2cd8ec76
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
channels/sessions.py
View File

@ -42,7 +42,13 @@ def channel_session(func):
def inner(message, *args, **kwargs):
# Make sure there's NOT a channel_session already
if hasattr(message, "channel_session"):
return func(message, *args, **kwargs)
try:
return func(message, *args, **kwargs)
finally:
# Persist session if needed
if message.channel_session.modified:
message.channel_session.save()
# Make sure there's a reply_channel
if not message.reply_channel:
raise ValueError(
@ -155,7 +161,13 @@ def http_session(func):
def inner(message, *args, **kwargs):
# Make sure there's NOT a http_session already
if hasattr(message, "http_session"):
return func(message, *args, **kwargs)
try:
return func(message, *args, **kwargs)
finally:
# Persist session if needed (won't be saved if error happens)
if message.http_session is not None and message.http_session.modified:
message.http_session.save()
try:
# We want to parse the WebSocket (or similar HTTP-lite) message
# to get cookies and GET, but we need to add in a few things that