diff options
| author | Duda Dornelles <ddornell@thoughtworks.com> | 2014-08-28 14:57:46 -0300 |
|---|---|---|
| committer | Duda Dornelles <ddornell@thoughtworks.com> | 2014-08-28 17:00:38 -0300 |
| commit | 42009ce9006a1c67df2dcebc6ff2002b36655682 (patch) | |
| tree | 52fd264dbecb986f37b2d79a75c70b1d69804a87 /service/pixelated/bitmask_libraries | |
| parent | 5207cd71baabc3203d3f7982d98168469139327d (diff) | |
Neissi/Duda: sending emails. also moving local smtp creation to mail_service so we can use it later
Diffstat (limited to 'service/pixelated/bitmask_libraries')
| -rw-r--r-- | service/pixelated/bitmask_libraries/session.py | 10 | ||||
| -rw-r--r-- | service/pixelated/bitmask_libraries/smtp.py | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/service/pixelated/bitmask_libraries/session.py b/service/pixelated/bitmask_libraries/session.py index 7fccc250..bb9bd3fe 100644 --- a/service/pixelated/bitmask_libraries/session.py +++ b/service/pixelated/bitmask_libraries/session.py @@ -118,12 +118,7 @@ class LeapSessionFactory(object): incoming_mail_fetcher = self._create_incoming_mail_fetcher(nicknym, soledad, account, auth) - smtp = self._create_smtp_service(nicknym, auth) - smtp.start() - - session = LeapSession(self._provider, auth, soledad, nicknym, account, incoming_mail_fetcher) - - return session + return LeapSession(self._provider, auth, soledad, nicknym, account, incoming_mail_fetcher) def _lookup_session(self, key): global SESSIONS @@ -162,9 +157,6 @@ class LeapSessionFactory(object): return LeapIncomingMail(nicknym.keymanager, soledad_session.soledad, account, self._config.fetch_interval_in_s, self._account_email(auth)) - def _create_smtp_service(self, nicknym, auth): - return LeapSmtp(self._provider, nicknym.keymanager, auth) - def _account_email(self, auth): domain = self._provider.domain name = auth.user_name diff --git a/service/pixelated/bitmask_libraries/smtp.py b/service/pixelated/bitmask_libraries/smtp.py index 94214e4c..76a232a6 100644 --- a/service/pixelated/bitmask_libraries/smtp.py +++ b/service/pixelated/bitmask_libraries/smtp.py @@ -35,7 +35,7 @@ class LeapSmtp(object): print "## SMTP port: " + str(self._twisted_port) def smtp_info(self): - return ('localhost', LeapSmtp.SMTP_PORT) + return ('localhost', self._twisted_port) def _discover_smtp_server(self): json_data = self._provider.fetch_smtp_json() @@ -79,7 +79,7 @@ class LeapSmtp(object): email = '%s@%s' % (self._srp_session.user_name, self._provider.domain) self._smtp_service, self._smtp_port = setup_smtp_gateway( - port=(self._twisted_port), + port=self._twisted_port, userid=email, keymanager=self._keymanager, smtp_host=self._hostname.encode('UTF-8'), |