summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-09-02 01:07:22 +0200
committerKali Kaneko <kali@leap.se>2013-09-02 17:40:14 +0200
commitc6baec1cc4e5b5aea2690569cb1be64b983d6986 (patch)
treebdf80522185f4a0e21ed3651a96630d7e6492148
parent614f588c603832586a175c6d8a96b4499c0518d1 (diff)
emit failed for all kinds of socket error
-rw-r--r--changes/bug-fail-soledad-when-socketerr1
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py3
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).")