Handle ConnectException's too

Author: brandonkelly

CHANGELOG.md

@@ -15,6 +15,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.
+- Fixed an exception that could occur when sending webhook requests, if Guzzle wasn’t able to connect to the server.
 
 ## 2.3.3 - 2021-04-01
 

src/Plugin.php

@@ -25,6 +25,7 @@
 use DateTime;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Exception\TransferException;
 use GuzzleHttp\RequestOptions;
 use ReflectionClass;
 use Throwable;
@@ -391,13 +392,16 @@ public function sendRequest(int $requestId): bool
             ->execute();
 
         $startTime = microtime(true);
+        $response = null;
         try {
             $response = Craft::createGuzzleClient($this->getSettings()->guzzleConfig)
                 ->request($data['method'], $data['url'], $options);
             $success = true;
-        } catch (RequestException $e) {
-            $response = $e->getResponse();
+        } catch (TransferException $e) {
             $success = false;
+            if ($e instanceof RequestException) {
+                $response = $e->getResponse();
+            }
         }
 
         // Update the request