node-resque
Advanced tools
Comparing version 0.14.0 to 0.14.1
@@ -284,3 +284,7 @@ var os = require("os"); | ||
self.connection.redis.smembers(self.connection.key('workers'), function(err, workers){ | ||
if(err){ throw err; } | ||
if(err){ | ||
if(typeof callback === 'function'){ callback(err); } | ||
else{ self.emit('error', null, null, err); } | ||
return; | ||
} | ||
workers.forEach(function(w){ | ||
@@ -287,0 +291,0 @@ var parts = w.split(":"); |
@@ -5,3 +5,3 @@ { | ||
"description": "an opinionated implementation of resque in node", | ||
"version": "0.14.0", | ||
"version": "0.14.1", | ||
"homepage": "http://github.com/taskrabbit/node-resque", | ||
@@ -8,0 +8,0 @@ "repository": { |
@@ -58,9 +58,16 @@ var specHelper = require(__dirname + "/../_specHelper.js").specHelper; | ||
resolved = false; | ||
worker = new specHelper.NR.worker({connection: connectionDetails, timeout: specHelper.timeout}, jobs, function(err){ | ||
if(resolved === false){ // new versions of redis will keep retrying in node v0.11x... | ||
should.exist(err); | ||
resolved = true; | ||
done(); | ||
} | ||
var resolved = false; | ||
worker = new specHelper.NR.worker({ | ||
connection: connectionDetails, | ||
timeout: specHelper.timeout | ||
}, jobs, function(err){ | ||
if (!resolved) should.exist(err); | ||
if (!resolved) worker.workerCleanup(function (err) { | ||
// new versions of redis will keep retrying in node v0.11x... | ||
if(!resolved){ | ||
should.exist(err); | ||
resolved = true; | ||
done(); | ||
} | ||
}); | ||
}); | ||
@@ -67,0 +74,0 @@ }); |
498712
3375