Skip to content

Commit

Permalink
Merge branch 'improvement/KR-248-worker-rewrite' into develop
Browse files Browse the repository at this point in the history
Conflicts:
	lib/Subscription.js
	utils/utils.js
  • Loading branch information
Razvan Botea committed Apr 25, 2016
2 parents e15c2aa + 4c0596d commit 1d3591e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/Subscription.js
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ Subscription.updateDevice = function(appId, device, props, callback) {
*/
Subscription.getSubscriptionKeysWithFilters = function(channel, callback) {
var filterChannels = [];
utils.scanRedisKeysPattern(channel.get()+':filter:*[^:deltas]', Application.redisClient, function(err, results) {
utils.scanRedisKeysPattern(channel.get()+':filter:*[^:count_cache:LOCK]', Application.redisClient, function(err, results) {
if (err) return callback(err);

for(var k in results) {
Expand Down

0 comments on commit 1d3591e

Please sign in to comment.