attemptDelay → retryDelay

Author: brandonkelly

README.md

@@ -50,7 +50,7 @@ The array can define the following keys:
 
 - `maxDepth` – The maximum depth that the plugin should go into objects/arrays when converting them to arrays for event payloads. (Default is `5`.)
 - `maxAttempts` – The maximum number of attempts each webhook should have before giving up, if the requests are coming back with non 2xx responses. (Default is `1`.)
-- `attemptDelay` – The delay (in seconds) between webhook attempts. (Default is `60`.)
+- `retryDelay` – The delay (in seconds) between webhook attempts. (Default is `60`.)
 
 ## Managing Webhooks
 

src/SendRequestJob.php

@@ -62,7 +62,7 @@ public function execute($queue)
             $settings = Plugin::getInstance()->getSettings();
             if ($attempts < $settings->maxAttempts) {
                 Craft::$app->getQueue()
-                    ->delay($settings->attemptDelay)
+                    ->delay($settings->retryDelay)
                     ->push(new self([
                         'requestId' => $this->requestId,
                     ]));

src/Settings.php

@@ -3,6 +3,7 @@
 namespace craft\webhooks;
 
 use craft\base\Model;
+use craft\helpers\ArrayHelper;
 
 class Settings extends Model
 {
@@ -18,9 +19,23 @@ class Settings extends Model
     public $maxAttempts = 1;
 
     /**
-     * @var int The time delay in seconds between request attempts.
+     * @var int The time delay in seconds between request retrys.
+     * @since 2.3.0
      */
-    public $attemptDelay = 60;
+    public $retryDelay = 60;
+
+    /**
+     * @inheritdoc
+     */
+    public function setAttributes($values, $safeOnly = true)
+    {
+        // attemptDelay → retryDelay
+        if (($retryDelay = ArrayHelper::remove($values, 'attemptDelay')) !== null) {
+            $values['retryDelay'] = $retryDelay;
+        }
+
+        parent::setAttributes($values, $safeOnly);
+    }
 
     /**
      * @inheritdoc

src/templates/_settings.twig

@@ -22,10 +22,10 @@
 
 {{ forms.textField({
     first: true,
-    id: 'attempt-delay',
-    label: 'Attempt Delay'|t('webhooks'),
+    id: 'retry-delay',
+    label: 'Retry Delay'|t('webhooks'),
     instructions: 'The time delay in seconds between request attempts.'|t('webhooks'),
     size: 5,
-    name: 'attemptDelay',
-    value: settings.attemptDelay,
+    name: 'retryDelay',
+    value: settings.retryDelay,
 }) }}