node-resque
Advanced tools
Comparing version 2.0.5 to 2.0.6
@@ -9,3 +9,3 @@ var os = require('os'); | ||
var self = this; | ||
var defaults = self.defaults(); | ||
@@ -19,3 +19,3 @@ for(var i in defaults){ | ||
if(options.connection.redis && typeof options.connection.redis.setMaxListeners === 'function'){ | ||
options.connection.redis.setMaxListeners(options.maxTaskProcessors + 1); | ||
options.connection.redis.setMaxListeners(options.connection.redis.getMaxListeners() + options.maxTaskProcessors); | ||
} | ||
@@ -32,6 +32,6 @@ | ||
self.eventLoopCheckCounter = 0; | ||
eventLoopDelay( | ||
self.options.maxEventLoopDelay, | ||
self.options.checkTimeout, | ||
self.options.maxEventLoopDelay, | ||
self.options.checkTimeout, | ||
function(blocked, ms){ | ||
@@ -64,3 +64,3 @@ self.eventLoopBlocked = blocked; | ||
var worker = new Worker({ | ||
connection: self.options.connection, | ||
connection: self.options.connection, | ||
queues: self.options.queues, | ||
@@ -72,3 +72,3 @@ timeout: self.options.timeout, | ||
worker.start(); | ||
worker.workerCleanup(function(error){ | ||
worker.workerCleanup(function(error){ | ||
if(error){ self.emit('error', error); } | ||
@@ -117,12 +117,12 @@ process.nextTick(callback); | ||
else if( | ||
!self.eventLoopBlocked && | ||
self.workers.length < self.options.maxTaskProcessors && | ||
!self.eventLoopBlocked && | ||
self.workers.length < self.options.maxTaskProcessors && | ||
( | ||
self.workers.length === 0 || | ||
self.workers.length === 0 || | ||
workingCount / self.workers.length > 0.5 | ||
) | ||
) | ||
){ verb = '+'; } | ||
else if( | ||
!self.eventLoopBlocked && | ||
self.workers.length > self.options.minTaskProcessors && | ||
!self.eventLoopBlocked && | ||
self.workers.length > self.options.minTaskProcessors && | ||
workingCount / self.workers.length < 0.5 | ||
@@ -150,5 +150,5 @@ ){ | ||
self.cleanupWorker(worker); | ||
if(touched === 0){ | ||
if(touched === 0){ | ||
self.workers = []; | ||
callback(err, verb, self.eventLoopDelay); | ||
callback(err, verb, self.eventLoopDelay); | ||
} | ||
@@ -225,3 +225,3 @@ }); | ||
var self = this; | ||
if(self.workers.length === 0 && self.working === false){ | ||
if(self.workers.length === 0 && self.working === false){ | ||
clearTimeout(self.checkTimer); | ||
@@ -228,0 +228,0 @@ setTimeout(function(){ |
@@ -6,3 +6,3 @@ { | ||
"license": "Apache-2.0", | ||
"version": "2.0.5", | ||
"version": "2.0.6", | ||
"homepage": "http://github.com/taskrabbit/node-resque", | ||
@@ -28,3 +28,3 @@ "repository": { | ||
"dependencies": { | ||
"ioredis": "^1.8.0" | ||
"ioredis": "^2.0.0" | ||
}, | ||
@@ -31,0 +31,0 @@ "devDependencies": { |
528214
+ Addedbluebird@3.7.2(transitive)
+ Addedcluster-key-slot@1.1.2(transitive)
+ Addedioredis@2.5.0(transitive)
+ Addedlodash@4.17.21(transitive)
+ Addedredis-commands@1.7.0(transitive)
+ Addedredis-parser@1.3.0(transitive)
- Removedbluebird@2.11.0(transitive)
- Removedioredis@1.15.1(transitive)
- Removedlodash@3.10.1(transitive)
Updatedioredis@^2.0.0