Disconnect redis connections if worker, queues or schedules are ended.

actionhero · May 28, 2015 · 0105f04 · 0105f04
1 parent 3e515fc
commit 0105f04
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/lib/multiWorker.js b/lib/multiWorker.js
@@ -170,7 +170,7 @@ multiWorker.prototype.cleanupWorker = function(worker){
   });
 
   if(self.options.toDisconnectProcessors === true){
-    worker.connection.redis.quit();
+    worker.connection.disconnect();
   }
 };
 

diff --git a/lib/queue.js b/lib/queue.js
@@ -23,7 +23,7 @@ var queue = function(options, jobs, callback){
 
 queue.prototype.end = function(callback){
   var self = this;
-  self.connection.redis.quit();
+  self.connection.disconnect();
   process.nextTick(function(){
     if(typeof callback === 'function'){ callback(); }
   });

diff --git a/lib/scheduler.js b/lib/scheduler.js
@@ -53,9 +53,12 @@ scheduler.prototype.end = function(callback) {
   self.running = false;
   if(self.processing === false){
     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(); }
+      });
     });
   }else if(self.processing === true){
     setTimeout(function(){

diff --git a/lib/worker.js b/lib/worker.js
@@ -67,8 +67,10 @@ worker.prototype.end = function(callback) {
     }, self.options.timeout);
   }else{
     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(); }
+      });
     });
   }
 };