Improve the Mail Service

src/Foundation/Application.php

@@ -41,7 +41,7 @@ class Application extends Container implements ResponsePreparerInterface
      *
      * @var string
      */
-    const VERSION = '4.0.55';
+    const VERSION = '4.0.56';
 
     /**
      * Indicates if the application has "booted".

src/Mail/Mailer.php

@@ -151,8 +151,6 @@ public function plain($view, array $data, $callback)
      */
     public function send($view, array $data, $callback)
     {
-        $this->forceReconnection();
-
         // First we need to parse the view, which could either be a string or an array
         // containing both an HTML and plain text versions of the view which should
         // be used when sending an e-mail. We will extract both of them out here.
@@ -172,18 +170,6 @@ public function send($view, array $data, $callback)
         $this->sendSwiftMessage($message);
     }
 
-    /**
-     * Force the transport to re-connect.
-     *
-     * This will prevent errors in daemon queue situations.
-     *
-     * @return void
-     */
-    protected function forceReconnection()
-    {
-        $this->getSwiftMailer()->getTransport()->stop();
-    }
-
     /**
      * Queue a new e-mail message for sending.
      *
@@ -362,10 +348,23 @@ protected function sendSwiftMessage($message)
             $this->events->dispatch('mailer.sending', array($message));
         }
 
-        if (! $this->pretending) {
+        if ($this->pretending) {
+            // In pretending mode we will log the message if the logger is available.
+
+            if (isset($this->logger)) {
+                $this->logMessage($message);
+            }
+
+            return;
+        }
+
+        try {
             $this->swift->send($message, $this->failedRecipients);
-        } else if (isset($this->logger)) {
-            $this->logMessage($message);
+        }
+        finally {
+            $transport = $this->swift->getTransport();
+
+            $transport->stop();
         }
     }