Added special SwiftMailerHandler that flushes mail queue if necessary

Author: pkraeutli

DependencyInjection/MonologExtension.php

@@ -276,6 +276,7 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
                 $handler['level'],
                 $handler['bubble'],
             ));
+            $definition->addMethodCall('setTransport', array(new Reference('swiftmailer.transport.real')));
             break;
 
         case 'native_mailer':

Handler/SwiftMailerHandler.php

@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\MonologBundle\Handler;
+
+use Monolog\Handler\SwiftMailerHandler as BaseSwiftMailerHandler;
+
+/**
+ * Extended SwiftMailerHandler that flushes mail queue if necessary
+ *
+ * @author Philipp Kräutli <[email protected]>
+ */
+class SwiftMailerHandler extends BaseSwiftMailerHandler
+{
+    protected $transport;
+
+    /**
+     * @param \Swift_Transport $transport
+     */
+    public function setTransport(\Swift_Transport $transport)
+    {
+        $this->transport = $transport;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function send($content, array $records)
+    {
+        parent::send($content, $records);
+
+        $this->flushQueue();
+    }
+
+    /**
+     * Flushes the mail queue if necessary
+     */
+    private function flushQueue()
+    {
+        $transport = $this->mailer->getTransport();
+        if (!$transport instanceof \Swift_Transport_SpoolTransport) {
+            return;
+        }
+
+        $spool = $transport->getSpool();
+        if (!$spool instanceof \Swift_MemorySpool) {
+            return;
+        }
+
+        if (null == $this->transport) {
+            throw new \Exception('No transport available to flush mail queue');
+        }
+
+        $spool->flushQueue($this->transport);
+    }
+}

Resources/config/monolog.xml

@@ -19,7 +19,7 @@
         <parameter key="monolog.handler.firephp.class">Symfony\Bridge\Monolog\Handler\FirePHPHandler</parameter>
         <parameter key="monolog.handler.chromephp.class">Symfony\Bridge\Monolog\Handler\ChromePhpHandler</parameter>
         <parameter key="monolog.handler.debug.class">Symfony\Bridge\Monolog\Handler\DebugHandler</parameter>
-        <parameter key="monolog.handler.swift_mailer.class">Monolog\Handler\SwiftMailerHandler</parameter>
+        <parameter key="monolog.handler.swift_mailer.class">Symfony\Bundle\MonologBundle\Handler\SwiftMailerHandler</parameter>
         <parameter key="monolog.handler.native_mailer.class">Monolog\Handler\NativeMailerHandler</parameter>
         <parameter key="monolog.handler.socket.class">Monolog\Handler\SocketHandler</parameter>
         <parameter key="monolog.handler.pushover.class">Monolog\Handler\PushoverHandler</parameter>