tFix SocketPipe: * add errcode 35 for BSD * in addition, add a very long timeout to command line pipe, in order to prevent that exception to be raised. - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 4655c5f5654097cb4385adcb3c414268b6dbdc9b
DIR parent ebddbcb805ab603287267cfd684c75d85e72a41d
HTML Author: ThomasV <thomasv@electrum.org>
Date: Thu, 3 Sep 2015 10:47:57 +0200
Fix SocketPipe:
* add errcode 35 for BSD
* in addition, add a very long timeout to command line pipe, in order to prevent that exception to be raised.
Diffstat:
M electrum | 2 +-
M lib/util.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
DIR diff --git a/electrum b/electrum
t@@ -510,7 +510,7 @@ if __name__ == '__main__':
s = get_daemon(config, False)
if s:
p = util.SocketPipe(s)
- p.set_timeout(False)
+ p.set_timeout(1000000)
p.send(config_options)
result = p.get()
s.close()
DIR diff --git a/lib/util.py b/lib/util.py
t@@ -403,7 +403,7 @@ class SocketPipe:
except socket.error, err:
if err.errno == 60:
raise timeout
- elif err.errno in [11, 10035]:
+ elif err.errno in [11, 35, 10035]:
print_error("socket errno", err.errno)
time.sleep(0.1)
continue