diff options
| author | Anike Arni <anikarni@gmail.com> | 2017-01-23 09:47:40 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-23 09:47:40 -0200 |
| commit | d9e9c8cd0c47ceb1883e7215dfcea055be391d96 (patch) | |
| tree | 039351d0410fe913ff8bf3c36e711ce981b4cccf /service/pixelated | |
| parent | 0d0f9c43777a047b1a8aa93b8adcbec8938962b5 (diff) | |
| parent | a966e35f5d3eda2cdcd39899e9bce6db6b4da73a (diff) | |
Merge pull request #947 from pixelated/keep-exception-context
Keep exception context
Diffstat (limited to 'service/pixelated')
| -rw-r--r-- | service/pixelated/config/leap.py | 2 | ||||
| -rw-r--r-- | service/pixelated/config/sessions.py | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/service/pixelated/config/leap.py b/service/pixelated/config/leap.py index 52a70f3e..2b3a242a 100644 --- a/service/pixelated/config/leap.py +++ b/service/pixelated/config/leap.py @@ -99,7 +99,7 @@ class BootstrapUserServices(object): log.warn('{0}: {1}. Closing session for user: {2}'.format(e.__class__.__name__, e, user_auth.username)) if leap_session: leap_session.close() - raise e + raise @defer.inlineCallbacks def _setup_user_services(self, leap_session): diff --git a/service/pixelated/config/sessions.py b/service/pixelated/config/sessions.py index b4d69d29..eb233a9f 100644 --- a/service/pixelated/config/sessions.py +++ b/service/pixelated/config/sessions.py @@ -18,9 +18,7 @@ from __future__ import absolute_import import os import errno -import traceback import requests -import sys from twisted.internet import defer, threads, reactor from twisted.logger import Logger @@ -35,10 +33,9 @@ from leap.common.events import ( catalog as events ) -from pixelated.bitmask_libraries.keymanager import Keymanager, UploadKeyError +from pixelated.bitmask_libraries.keymanager import Keymanager from pixelated.adapter.mailstore import LeapMailStore from pixelated.config import leap_config -from pixelated.bitmask_libraries.certs import LeapCertificate from pixelated.bitmask_libraries.smtp import LeapSMTPConfig logger = Logger() |