summaryrefslogtreecommitdiff
path: root/service/pixelated/config/sessions.py
diff options
context:
space:
mode:
Diffstat (limited to 'service/pixelated/config/sessions.py')
-rw-r--r--service/pixelated/config/sessions.py21
1 files changed, 3 insertions, 18 deletions
diff --git a/service/pixelated/config/sessions.py b/service/pixelated/config/sessions.py
index eba55100..2bad3e32 100644
--- a/service/pixelated/config/sessions.py
+++ b/service/pixelated/config/sessions.py
@@ -118,15 +118,6 @@ class LeapSessionFactory(object):
cert = SmtpClientCertificate(self._provider, auth, self._user_path(auth.uuid))
return cert.cert_path()
- def _create_dir(self, path):
- try:
- os.makedirs(path)
- except OSError as exc:
- if exc.errno == errno.EEXIST and os.path.isdir(path):
- pass
- else:
- raise
-
def _user_path(self, user_uuid):
return os.path.join(leap_config.leap_home, user_uuid)
@@ -172,13 +163,7 @@ class LeapSession(object):
@defer.inlineCallbacks
def finish_bootstrap(self):
- try:
- yield self.keymanager.generate_openpgp_key()
- except UploadKeyError as e:
- logger.warn('{0}: {1}. Closing session for user: {2}'.format(e.__class__.__name__, e, self.account_email()))
- self.close()
- raise
-
+ yield self.keymanager.generate_openpgp_key()
yield self._create_account(self.soledad, self.user_auth.uuid)
self.incoming_mail_fetcher = yield self._create_incoming_mail_fetcher(
self.keymanager,
@@ -236,8 +221,8 @@ class LeapSession(object):
def sync(self):
try:
return self.soledad.sync()
- except:
- traceback.print_exc(file=sys.stderr)
+ except Exception as e:
+ logger.error(e)
raise