Use Queue::push()

Author: brandonkelly

CHANGELOG.md

@@ -12,6 +12,7 @@
 
 ### Fixed
 - Fixed an error that could occur when calling `craft\webhooks\Plugin::getRequestData()` if an invalid request ID was passed.
+- Fixed an exception that could occur when retrying webhook requests, if the queue driver didn’t support delayed jobs.
 
 ## 2.3.3 - 2021-04-01
 

src/Plugin.php

@@ -9,6 +9,7 @@
 use craft\helpers\ArrayHelper;
 use craft\helpers\Db;
 use craft\helpers\Json;
+use craft\helpers\Queue;
 use craft\helpers\StringHelper;
 use craft\web\UrlManager;
 use craft\webhooks\filters\DraftFilter;
@@ -318,9 +319,8 @@ public function request(string $method, string $url, array $headers = null, stri
      */
     public function pushPendingJobs()
     {
-        $queue = Craft::$app->getQueue();
         while ($job = array_shift($this->_pendingJobs)) {
-            $queue->push($job);
+            Queue::push($job);
         }
     }
 

src/SendRequestJob.php

@@ -6,6 +6,7 @@
 use craft\db\Query;
 use craft\helpers\Db;
 use craft\helpers\Json;
+use craft\helpers\Queue;
 use craft\queue\BaseJob;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\RequestOptions;
@@ -61,11 +62,9 @@ public function execute($queue)
             $attempts = $this->_data()['attempts'];
             $settings = Plugin::getInstance()->getSettings();
             if ($attempts < $settings->maxAttempts) {
-                Craft::$app->getQueue()
-                    ->delay($settings->retryDelay)
-                    ->push(new self([
-                        'requestId' => $this->requestId,
-                    ]));
+                Queue::push(new self([
+                    'requestId' => $this->requestId,
+                ]), null, $settings->retryDelay);
             }
         }
     }