node-resque
Advanced tools
Comparing version 0.14.1 to 0.15.0
@@ -101,3 +101,6 @@ var connection = function(options){ | ||
var self = this; | ||
return self.redis.quit(); | ||
// Only disconnect if we established the redis connection on our own. | ||
if (!self.options.redis) { | ||
return self.redis.quit(); | ||
} | ||
} | ||
@@ -104,0 +107,0 @@ |
@@ -173,3 +173,3 @@ var os = require('os'); | ||
if(self.options.toDisconnectProcessors === true){ | ||
worker.connection.redis.quit(); | ||
worker.connection.disconnect(); | ||
} | ||
@@ -176,0 +176,0 @@ }; |
@@ -26,3 +26,3 @@ var util = require('util'); | ||
var self = this; | ||
self.connection.redis.quit(); | ||
self.connection.disconnect(); | ||
process.nextTick(function(){ | ||
@@ -29,0 +29,0 @@ if(typeof callback === 'function'){ callback(); } |
@@ -56,5 +56,8 @@ // TODO: Locking like ruby does | ||
clearTimeout(self.timer); | ||
self.emit('end'); | ||
process.nextTick(function(){ | ||
if(typeof callback === 'function'){ callback(); } | ||
self.queue.end(function() { | ||
self.emit('end'); | ||
self.connection.disconnect(); | ||
process.nextTick(function(){ | ||
if(typeof callback === 'function'){ callback(); } | ||
}); | ||
}); | ||
@@ -61,0 +64,0 @@ }else if(self.processing === true){ |
@@ -70,4 +70,6 @@ var os = require("os"); | ||
self.untrack(self.name, self.stringQueues(), function(){ | ||
self.emit('end'); | ||
if(typeof callback === 'function'){ callback(); } | ||
self.queueObject.end(function() { | ||
self.emit('end'); | ||
if(typeof callback === 'function'){ callback(); } | ||
}); | ||
}); | ||
@@ -74,0 +76,0 @@ } |
@@ -5,3 +5,3 @@ { | ||
"description": "an opinionated implementation of resque in node", | ||
"version": "0.14.1", | ||
"version": "0.15.0", | ||
"homepage": "http://github.com/taskrabbit/node-resque", | ||
@@ -8,0 +8,0 @@ "repository": { |
498957
3383