Merge pull request #3 from boboldehampsink/patch-1

Don't take failed jobs into account
nerds-and-company · May 6, 2021 · 9db578f · 9db578f
2 parents 27ecf03 + 0e248b7
commit 9db578f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.0.3 - 2021-05-06
+### Fixed
+- Don't take failed jobs into account
+
+## 1.0.2 - 2021-03-04
+### Added
+- Added PHP8 support
+
 ## 1.0.1 - 2020-03-19
 ### Fixed
 - Take all jobs into account, not only pending jobs

diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.0.2",
+    "version": "1.0.3",
     "name": "nerds-and-company/craft-hirefire",
     "description": "Hirefire.io worker scheduler for Craft 3 queue jobs",
     "type": "craft-plugin",

diff --git a/src/controllers/InfoController.php b/src/controllers/InfoController.php
@@ -33,10 +33,12 @@ public function actionIndex(string $token): Response
             throw new UserException(Craft::t('hirefire', 'Invalid Hirefire token.'));
         }
 
+        $queue = Craft::$app->queue;
+
         // Return pending queue for worker
         return $this->asJson([[
             'name' => 'worker',
-            'quantity' => Craft::$app->queue->getTotalJobs(),
+            'quantity' => $queue->getTotalJobs() - $queue->getTotalFailed(),
         ]]);
     }
 }