catch Swift_SwiftException when flushing queue

radutopala · Jun 8, 2016 · fd3236d · fd3236d
1 parent 5839d9d
commit fd3236d
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/Library/AutomailerSpool.php b/Library/AutomailerSpool.php
@@ -159,15 +159,21 @@ public function flushQueue(\Swift_Transport $transport, &$failedRecipients = nul
         reset($mails);
 
         foreach ($mails as $mail) {
-            if ($transport->send($mail->getSwiftMessage(), $failedRecipients)) {
-                ++$count;
-                $mail->setIsSending(false);
-                $mail->setIsSent(true);
-                $mail->setSentAt(new \DateTime());
-            } else {
+            try {
+                if ($transport->send($mail->getSwiftMessage(), $failedRecipients)) {
+                    ++$count;
+                    $mail->setIsSending(false);
+                    $mail->setIsSent(true);
+                    $mail->setSentAt(new \DateTime());
+                } else {
+                    $mail->setIsSending(false);
+                    $mail->setIsFailed(true);
+                }
+            } catch (\Swift_SwiftException $e) {
                 $mail->setIsSending(false);
                 $mail->setIsFailed(true);
             }
+
             $this->save($mail);
 
             if ($this->getMessageLimit() && $count >= $this->getMessageLimit()) {