diff options
| author | Bruno Wagner <bwgpro@gmail.com> | 2015-06-15 16:39:33 -0300 |
|---|---|---|
| committer | Bruno Wagner <bwgpro@gmail.com> | 2015-06-15 16:40:28 -0300 |
| commit | 96616d25a0f4abf1b4c4c9360a5aa8de1ecfad79 (patch) | |
| tree | ccd4087aabf6ac047f4dc73027c98195d3c7a3dd | |
| parent | ff1db7d72d1ee3b3f9de83913bc98cb048bfc207 (diff) | |
SMTP now runs with the rest of the background jobs, that means register no longer starts the smtp server
| -rw-r--r-- | service/pixelated/bitmask_libraries/provider.py | 1 | ||||
| -rw-r--r-- | service/pixelated/bitmask_libraries/session.py | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/service/pixelated/bitmask_libraries/provider.py b/service/pixelated/bitmask_libraries/provider.py index e08bfb43..315ea7f1 100644 --- a/service/pixelated/bitmask_libraries/provider.py +++ b/service/pixelated/bitmask_libraries/provider.py @@ -26,7 +26,6 @@ class LeapProvider(object): self.server_name = server_name self.config = config self.local_ca_crt = '%s/ca.crt' % self.config.leap_home - self.provider_json = self.fetch_provider_json() @property diff --git a/service/pixelated/bitmask_libraries/session.py b/service/pixelated/bitmask_libraries/session.py index 49116641..3f548e70 100644 --- a/service/pixelated/bitmask_libraries/session.py +++ b/service/pixelated/bitmask_libraries/session.py @@ -82,9 +82,11 @@ class LeapSession(object): self.stop_background_jobs() def start_background_jobs(self): + self.smtp.ensure_running() reactor.callFromThread(self.incoming_mail_fetcher.start_loop) def stop_background_jobs(self): + self.smtp.stop() reactor.callFromThread(self.incoming_mail_fetcher.stop) def sync(self): @@ -125,8 +127,6 @@ class LeapSessionFactory(object): smtp = LeapSmtp(self._provider, auth.username, auth.session_id, nicknym.keymanager) - smtp.ensure_running() - return LeapSession(self._provider, auth, soledad, nicknym, account, incoming_mail_fetcher, smtp) def _lookup_session(self, key): |