Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed connections not leaving their rooms with namespace.disconnect() #83

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions flask_socketio/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ def leave_room(self, room):
if self.socketio._leave_room(self, room):
self.rooms.remove(room)

def leave_all_rooms(self):
for room in self.rooms.copy():
self.leave_room(room)

def recv_connect(self):
if self.socketio.server is None:
self.socketio.server = self.environ['socketio'].server
Expand All @@ -83,8 +87,7 @@ def recv_disconnect(self):
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)
self.leave_all_rooms()
return super(GenericNamespace, self).recv_disconnect()

def recv_message(self, data):
Expand Down Expand Up @@ -127,6 +130,10 @@ def send(self, message, json=False, ns_name=None, callback=None,
json,
callback)

def disconnect(self, silent=False):
self.leave_all_rooms()
return super(GenericNamespace, self).disconnect(silent)

namespaces = dict((ns_name, GenericNamespace)
for ns_name in self.messages)
return namespaces
Expand Down