Exception types

murrant · Nov 4, 2024 · 84cb4f5 · 84cb4f5
1 parent aed82f4
commit 84cb4f5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/LibreNMS/Alert/Transport/Mail.php b/LibreNMS/Alert/Transport/Mail.php
@@ -52,8 +52,6 @@ public function deliverAlert(array $alert_data): bool
 
         try {
             return \LibreNMS\Util\Mail::send($emails, $alert_data['title'], $msg, $html, $this->config['bcc'] ?? false, $this->config['attach-graph'] ?? null);
-        } catch (\PHPMailer\PHPMailer\Exception $e) {
-            throw new AlertTransportDeliveryException($alert_data, 0, $e->errorMessage());
         } catch (Exception $e) {
             throw new AlertTransportDeliveryException($alert_data, 0, $e->getMessage());
         }

diff --git a/LibreNMS/Util/Mail.php b/LibreNMS/Util/Mail.php
@@ -73,7 +73,7 @@ public static function parseEmails($emails)
      * @param  bool|null  $embedGraphs
      * @return bool
      *
-     * @throws \PHPMailer\PHPMailer\Exception
+     * @throws \PHPMailer\PHPMailer\Exception|Exception if delivery fails
      */
     public static function send($emails, $subject, $message, bool $html = false, bool $bcc = false, ?bool $embedGraphs = null): bool
     {