Skip to content

Patch/redis disconnect #667

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.

Sign up for GitHub

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

Merged
rauchg merged 2 commits into from
Nov 26, 2011
Merged

Patch/redis disconnect #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5ab46d
Fixes leaking Redis subscriptions for #663. The local flag was not ge…
dshaw Nov 26, 2011
c110036
Handle leaked dispatch:[id] subscription.
dshaw Nov 26, 2011
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
5 changes: 3 additions & 2 deletions lib/manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,13 +468,14 @@ Manager.prototype.onClientMessage = function (id, packet) {
* @api private
*/

Manager.prototype.onClientDisconnect = function (id, reason) {
Manager.prototype.onClientDisconnect = function (id, reason, local) {
for (var name in this.namespaces) {
this.namespaces[name].handleDisconnect(id, reason, typeof this.roomClients[id] !== 'undefined' &&
typeof this.roomClients[id][name] !== 'undefined');
}

this.onDisconnect(id);
if (local) this.store.publish('disconnect', id);
this.onDisconnect(id, local);
};

/**
Expand Down
5 changes: 3 additions & 2 deletions lib/transport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,14 +457,15 @@ Transport.prototype.end = function (reason) {
if (!this.disconnected) {
this.log.info('transport end');

var local = this.manager.transports[this.id];
var local = !!this.manager.transports[this.id];

this.close();
this.clearTimeouts();
this.disconnected = true;


if (local) {
this.manager.onClientDisconnect(this.id, reason, true);
this.manager.onClientDisconnect(this.id, reason, local);
} else {
this.store.publish('disconnect:' + this.id, reason);
}
Expand Down