fixes #37: broadcast without namespace

miguelgrinberg · Jun 15, 2014 · 9844dfe · 9844dfe
1 parent 2a08c09
commit 9844dfe
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/flask_socketio/__init__.py b/flask_socketio/__init__.py
@@ -52,6 +52,8 @@ def initialize(self):
                 self.rooms = set()
 
             def process_event(self, packet):
+                if self.socketio.server is None:
+                    self.socketio.server = self.environ['socketio'].server
                 message = packet['name']
                 args = packet['args']
                 app = self.request
@@ -74,17 +76,23 @@ def recv_connect(self):
                 return ret
 
             def recv_disconnect(self):
+                if self.socketio.server is None:
+                    self.socketio.server = self.environ['socketio'].server
                 app = self.request
                 self.socketio._dispatch_message(app, self, 'disconnect')
                 for room in self.rooms.copy():
                     self.leave_room(room)
                 return super(GenericNamespace, self).recv_disconnect()
 
             def recv_message(self, data):
+                if self.socketio.server is None:
+                    self.socketio.server = self.environ['socketio'].server
                 app = self.request
                 return self.socketio._dispatch_message(app, self, 'message', [data])
 
             def recv_json(self, data):
+                if self.socketio.server is None:
+                    self.socketio.server = self.environ['socketio'].server
                 app = self.request
                 return self.socketio._dispatch_message(app, self, 'json', [data])
 
@@ -151,7 +159,7 @@ def _leave_room(self, namespace, room):
 
                     return True
         return False
-        
+
     def on_message(self, message, handler, **options):
         ns_name = options.pop('namespace', '')
         if ns_name not in self.messages: