From d79aa00e3c24c5bf5e5ed5ba5a9b976f93034362 Mon Sep 17 00:00:00 2001 From: Folker Bernitt Date: Wed, 4 Nov 2015 10:11:19 +0100 Subject: Instantiate new MailSender in Services - Issue #499 - Some smaller refactorings - Extract smtp cert download to own class --- service/pixelated/adapter/services/mail_sender.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'service/pixelated/adapter/services') diff --git a/service/pixelated/adapter/services/mail_sender.py b/service/pixelated/adapter/services/mail_sender.py index a3315b53..ca1e99d7 100644 --- a/service/pixelated/adapter/services/mail_sender.py +++ b/service/pixelated/adapter/services/mail_sender.py @@ -30,12 +30,9 @@ class SMTPDownException(Exception): class MailSender(object): - def __init__(self, account_email_address, keymanager, cert_path, remote_smtp_host, remote_smtp_port): - self._from = account_email_address + def __init__(self, smtp_config, keymanager): + self._smtp_config = smtp_config self._keymanager = keymanager - self._cert_path = cert_path - self._remote_smtp_host = remote_smtp_host - self._remote_smtp_port = remote_smtp_port def sendmail(self, mail): recipients = flatten([mail.to, mail.cc, mail.bcc]) @@ -48,7 +45,12 @@ class MailSender(object): return defer.gatherResults(deferreds) def _create_outgoing_mail(self): - return OutgoingMail(str(self._from), self._keymanager, unicode(self._cert_path), unicode(self._cert_path), str(self._remote_smtp_host), int(self._remote_smtp_port)) + return OutgoingMail(str(self._smtp_config.account_email), + self._keymanager, + self._smtp_config.cert_path, + self._smtp_config.cert_path, + str(self._smtp_config.remote_smtp_host), + int(self._smtp_config.remote_smtp_port)) class LocalSmtpMailSender(object): -- cgit v1.2.3