fix: make sure closing is returned in every close call

taskforcesh · Apr 10, 2020 · 88c5948 · 88c5948
1 parent 011b8ac
commit 88c5948
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/classes/queue-base.ts b/src/classes/queue-base.ts
@@ -72,7 +72,10 @@ export class QueueBase extends EventEmitter {
   }
 
   close() {
-    return (this.closing = this.connection.close());
+    if (!this.closing) {
+      this.closing = this.connection.close();
+    }
+    return this.closing;
   }
 
   disconnect() {

diff --git a/src/classes/queue-events.ts b/src/classes/queue-events.ts
@@ -68,6 +68,9 @@ export class QueueEvents extends QueueBase {
   }
 
   async close() {
-    return (this.closing = this.disconnect());
+    if (!this.closing) {
+      this.closing = this.disconnect();
+    }
+    return this.closing;
   }
 }
diff --git a/src/classes/queue-scheduler.ts b/src/classes/queue-scheduler.ts
@@ -170,10 +170,13 @@ export class QueueScheduler extends QueueBase {
   }
 
   async close() {
+    if (this.closing) {
+      return this.closing;
+    }
     if (this.isBlocked) {
       this.closing = this.disconnect();
     } else {
-      super.close();
+      this.closing = super.close();
     }
     return this.closing;
   }