Skip to content
This repository has been archived by the owner on Feb 11, 2020. It is now read-only.

Proper Unsubscribe handling, fixes #405 #410

Merged
merged 2 commits into from
Feb 22, 2016
Merged

Proper Unsubscribe handling, fixes #405 #410

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0db960d
Merge pull request #4 from mcollina/master
behrad Jan 29, 2016
f24ad43
Properly handle un-subscription, fixes #405
behrad Feb 6, 2016
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
33 changes: 29 additions & 4 deletions lib/persistence/redis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function RedisPersistence(options, callback) {
this._closing = false;
this._closed = false;

var newSub = function(key, cb, retried) {
var newSub = function(key, unsubs, retried, cb) {
that._client.get(key, function(err, result) {
if (err) {
if (cb) {
Expand All @@ -98,7 +98,7 @@ function RedisPersistence(options, callback) {

if (!result || typeof subs !== 'object') {
if (!retried) {
setTimeout(newSub.bind(null, key, cb, true), 500);
setTimeout(newSub.bind(null, key, unsubs, true, cb), 500);
}
return;
}
Expand All @@ -109,6 +109,12 @@ function RedisPersistence(options, callback) {
}
});

if( unsubs ) {
unsubs.forEach(function(sub) {
that._subMatcher.remove(sub, id);
});
}

var redisError = null;
var redisVersions = that._client.server_info.versions;
if ( (redisVersions[0] * 1000 + redisVersions[1]) < 2006 ) {
Expand All @@ -135,7 +141,7 @@ function RedisPersistence(options, callback) {
}
var parsed = JSON.parse(message);
if (parsed.process !== that._id) {
newSub(parsed.key);
newSub(parsed.key, parsed.unsubs);
}
});

Expand All @@ -147,7 +153,9 @@ function RedisPersistence(options, callback) {
if (err) {
return callback && callback(err, that);
}
async.each(keys, newSub, function(err) {
async.each(keys, function(k,next){
newSub(k,null,false,next);
}, function(err) {
if (callback) {
callback(err, that);
}
Expand Down Expand Up @@ -252,6 +260,23 @@ RedisPersistence.prototype.storeSubscriptions = function(client, cb) {
});

var op = this._client.multi()
.get(clientSubKey, function(err, currentSubs){
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd have preferred to write this with Promises, to merge two publishes, however it won't happen in a single multi, since we need first to get current subscriptions before updating them

if( err || !currentSubs ) {
return;
}
currentSubs = JSON.parse( currentSubs );
var unsubs = Object.keys(currentSubs).filter(function(topic){
return !subscriptions[topic];
});
unsubs.forEach(function(topic) {
that._subMatcher.remove(topic, client.id);
});
that._client.publish(that.options.channel, JSON.stringify({
key: clientSubKey,
unsubs: unsubs,
process: that._id
}));
})
.set(clientSubKey, JSON.stringify(subscriptions))
.publish(this.options.channel, JSON.stringify({
key: clientSubKey,
Expand Down