summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/services
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-10 10:48:27 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-10 10:48:27 -0300
commit24fb8f22f51eb1835a04a8935c3e1b26e4081bc1 (patch)
tree50548da16f14b67df8c04cbb74406af80e6463b2 /src/leap/bitmask/services
parent272a67b861ee67a798717ab5c625b75703a4e695 (diff)
parentb4d68f51db92564d5af6db71a092f7f6b48b93aa (diff)
Merge remote-tracking branch 'kali/bug/catch-u1db-httperror' into develop
Diffstat (limited to 'src/leap/bitmask/services')
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index 7968dd6a..409389be 100644
--- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -264,6 +264,10 @@ class SoledadBootstrapper(AbstractBootstrapper):
logger.error("Error while initializing soledad "
"(unauthorized).")
self.soledad_failed.emit()
+ except u1db_errors.HTTPError as exc:
+ logger.exception("Error whie initializing soledad "
+ "(HTTPError)")
+ self.soledad_failed.emit()
except Exception as exc:
logger.exception("Unhandled error while initializating "
"soledad: %r" % (exc,))