diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-10-10 10:48:27 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-10-10 10:48:27 -0300 |
| commit | 24fb8f22f51eb1835a04a8935c3e1b26e4081bc1 (patch) | |
| tree | 50548da16f14b67df8c04cbb74406af80e6463b2 | |
| parent | 272a67b861ee67a798717ab5c625b75703a4e695 (diff) | |
| parent | b4d68f51db92564d5af6db71a092f7f6b48b93aa (diff) | |
Merge remote-tracking branch 'kali/bug/catch-u1db-httperror' into develop
| -rw-r--r-- | changes/bug_catch_u1db_httperror | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/services/soledad/soledadbootstrapper.py | 4 |
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,)) |