Skip to content

Commit

Permalink
fixes #6: save session variables correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
miguelgrinberg committed Feb 15, 2014
1 parent c60739b commit 173876e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
13 changes: 9 additions & 4 deletions example/app.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from flask import Flask, render_template
from flask import Flask, render_template, session
from flask.ext.socketio import SocketIO, emit

app = Flask(__name__)
Expand All @@ -14,17 +14,22 @@ def index():

@socketio.on('my event', namespace='/test')
def test_message(message):
emit('my response', {'data': message['data']})
session['receive_count'] = session.get('receive_count', 0) + 1
emit('my response',
{'data': message['data'], 'count': session['receive_count']})


@socketio.on('my broadcast event', namespace='/test')
def test_message(message):
emit('my response', {'data': message['data']}, broadcast=True)
session['receive_count'] = session.get('receive_count', 0) + 1
emit('my response',
{'data': message['data'], 'count': session['receive_count']},
broadcast=True)


@socketio.on('connect', namespace='/test')
def test_connect():
emit('my response', {'data': 'Connected'})
emit('my response', {'data': 'Connected', 'count': 0})


@socketio.on('disconnect', namespace='/test')
Expand Down
2 changes: 1 addition & 1 deletion example/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
$(document).ready(function(){
var socket = io.connect('http://' + document.domain + ':' + location.port + '/test');
socket.on('my response', function(msg) {
$('#log').append('<p>Received: ' + msg.data + '</p>');
$('#log').append('<p>Received #' + msg.count + ': ' + msg.data + '</p>');
});
$('form#emit').submit(function(event) {
socket.emit('my event', {data: $('#emit_data').val()});
Expand Down
2 changes: 1 addition & 1 deletion flask_socketio.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def dispatch_message(self, app, namespace, message, args=[]):
session[k] = v
self.messages[namespace.ns_name][message](*args)
for k, v in session.items():
self.namespace[k] = v
namespace.session[k] = v

def on_message(self, message, handler, **options):
namespace = options.pop('namespace', '/')
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

setup(
name='Flask-SocketIO',
version='0.2.0',
version='0.2.1',
url='http://github.com/miguelgrinberg/Flask-SocketIO/',
license='MIT',
author='Miguel Grinberg',
Expand Down

0 comments on commit 173876e

Please sign in to comment.