Merge pull request #19 from hajipy/change_shutdown_behavior

If the job is completed before the timeout during the shutdown, make it successful.
hajipy · Apr 16, 2020 · 8807771 · 8807771
2 parents fca4317 + a1beeb4
commit 8807771
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/dist/worker.js b/dist/worker.js
@@ -92,12 +92,9 @@ class Worker {
             this._currentJob = null;
             return;
         }
-        // 実行中じゃなければシャットダウンが進行中なので、処理を中断する
-        if (this._isRunning === false) {
-            this._currentJob = null;
+        if (this._currentJob === null) {
             return;
         }
-        // ジョブが削除されていれば、処理を中断する
         if (await this._currentJob.isExist() === false) {
             this._currentJob = null;
             return;

diff --git a/src/worker.ts b/src/worker.ts
@@ -129,13 +129,10 @@ export class Worker {
             return;
         }
 
-        // 実行中じゃなければシャットダウンが進行中なので、処理を中断する
-        if (this._isRunning === false) {
-            this._currentJob = null;
+        if (this._currentJob === null) {
             return;
         }
 
-        // ジョブが削除されていれば、処理を中断する
         if (await this._currentJob.isExist() === false) {
             this._currentJob = null;
             return;