Better error logging for SMTP errors

horde · Dec 2, 2014 · df9bcf1 · df9bcf1
1 parent 8cbd19b
commit df9bcf1
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
@@ -2420,7 +2420,23 @@ public function sendRedirectMessage($to, $log = true)
                 try {
                     $injector->getInstance('IMP_Mail')->send($to, $hdr_array, $contents->getBody());
                 } catch (Horde_Mail_Exception $e) {
-                    throw new IMP_Compose_Exception($e);
+                    $e2 = new IMP_Compose_Exception($e);
+
+                    if (($prev = $e->getPrevious()) &&
+                        ($prev instanceof Horde_Smtp_Exception)) {
+                        Horde::log(
+                            sprintf(
+                                "SMTP Error: %s (%u; %s)",
+                                $prev->raw_msg,
+                                $prev->getCode(),
+                                $prev->getEnhancedSmtpCode() ?: 'N/A'
+                            ),
+                            'ERR'
+                        );
+                        $e2->logged = true;
+                    }
+
+                    throw $e2;
                 }
 
                 $recipients = strval($recip['list']);