summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug_catch_u1db_httperror1
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py4
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug_catch_u1db_httperror b/changes/bug_catch_u1db_httperror
new file mode 100644
index 00000000..1045f1d1
--- /dev/null
+++ b/changes/bug_catch_u1db_httperror
@@ -0,0 +1 @@
+ o Catch u1db errors during soledad initialization.
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,))