Merge pull request OptimalBits#1534 from gabegorelick/pause

fix: queue.pause(true, true) doesn't pause queue
nevzatcubukcu · Nov 5, 2019 · d99f7f6 · d99f7f6
2 parents f20e2f9 + 52b387f
commit d99f7f6
Show file tree

Hide file tree

Showing 2 changed files with 326 additions and 271 deletions.
diff --git a/lib/queue.js b/lib/queue.js
@@ -778,7 +778,15 @@ Queue.prototype.pause = function(isLocal, doNotWaitActive) {
             };
           });
         }
-        return !doNotWaitActive && this.whenCurrentJobsFinished();
+
+        if (doNotWaitActive) {
+          // Force reconnection of blocking connection to abort blocking redis call immediately.
+          return redisClientDisconnect(this.bclient).then(() => {
+            return this.bclient.connect();
+          });
+        }
+
+        return this.whenCurrentJobsFinished();
       } else {
         return scripts.pause(this, true);
       }