Fixed bugs in development mailing subroutine.

(Redmine issue: #7041)

lib/mentat/plugin/app/mailer.py

@@ -166,7 +166,7 @@ class MailerPlugin(pyzenkit.baseapp.ZenAppPlugin):
             proc.communicate(bytes(email.as_string(), 'UTF-8'))
 
     @staticmethod
-    def mail_smtplib(email):
+    def mail_smtplib(email, server, port):
         """
         Send given email via smtplib.
 
@@ -176,9 +176,9 @@ class MailerPlugin(pyzenkit.baseapp.ZenAppPlugin):
             'return-path',
             email.get_header('from')
         )
-        s = self.get_application().c(self.CONFIG_MAIL_DEV_SERVER)
-        p = self.get_application().c(self.CONFIG_MAIL_DEV_PORT)
-        with smtplib.SMTP(s, p) as smtp:
+        server = server or 'localhost'
+        port   = port or 25
+        with smtplib.SMTP(server, port) as smtp:
             smtp.send_message(email, from_addr = envelope_from)
 
     #---------------------------------------------------------------------------
@@ -242,8 +242,12 @@ class MailerPlugin(pyzenkit.baseapp.ZenAppPlugin):
         msg = email_class(email_headers, **email_params)
 
         if self.get_application().c(self.CONFIG_MAIL_DEV_MODE):
-            self.mail_smtplib(msg)
-        else
+            self.mail_smtplib(
+                msg,
+                self.get_application().c(self.CONFIG_MAIL_DEV_SERVER),
+                self.get_application().c(self.CONFIG_MAIL_DEV_PORT)
+            )
+        else:
             self.mail_sendmail(msg)
 
         return msg