diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-09-04 08:45:57 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-09-04 08:45:57 -0300 |
| commit | e7a36da5aaa1924943d5f42a915b2ea4d4b8a70f (patch) | |
| tree | 8736268e36dc2e1c503c508ba23ed8d60fe1458e | |
| parent | cdc10a30b0a76eaa5c302b12996766faa90300dc (diff) | |
| parent | c6baec1cc4e5b5aea2690569cb1be64b983d6986 (diff) | |
Merge remote-tracking branch 'kali/bug/fail_soledad_when_socketerr' into develop
| -rw-r--r-- | changes/bug-fail-soledad-when-socketerr | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/services/soledad/soledadbootstrapper.py | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/changes/bug-fail-soledad-when-socketerr b/changes/bug-fail-soledad-when-socketerr new file mode 100644 index 00000000..2bb6696a --- /dev/null +++ b/changes/bug-fail-soledad-when-socketerr @@ -0,0 +1 @@ + o Make soledad emit failed signal for all kinds of socket error. diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index 2419fc0d..3bbfea85 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -159,8 +159,7 @@ class SoledadBootstrapper(AbstractBootstrapper): self.soledad_timeout.emit() except socket.error as exc: logger.error("Socket error while initializing soledad") - if exc.errno in (111, ): - self.soledad_failed.emit() + self.soledad_failed.emit() except u1db_errors.Unauthorized: logger.error("Error while initializing soledad " "(unauthorized).") |