tMerge pull request #1278 from kyuupichan/SocketPipe-no-close - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit fff4fe9e4a82ea886ecef49d75e3c6e623e358ef
DIR parent 47ebec176517a59007ec7801e3050689fabf1c98
HTML Author: ThomasV <electrumdev@gmail.com>
Date: Thu, 4 Jun 2015 12:43:11 +0200
Merge pull request #1278 from kyuupichan/SocketPipe-no-close
SocketPipe shouldn't close the socket.
Diffstat:
M lib/interface.py | 7 ++-----
M lib/util.py | 3 +--
2 files changed, 3 insertions(+), 7 deletions(-)
---
DIR diff --git a/lib/interface.py b/lib/interface.py
t@@ -61,7 +61,6 @@ class TcpInterface(threading.Thread):
# closing the socket
self.disconnect = False
self._status = CS_OPENING
- self.needs_shutdown = True
self.debug = False # dump network messages. can be changed at runtime using the console
self.message_id = 0
self.response_queue = response_queue
t@@ -304,7 +303,6 @@ class TcpInterface(threading.Thread):
return
# If remote side closed the socket, SocketPipe closes our socket and returns None
if response is None:
- self.needs_shutdown = False # Don't re-close the socket
self.disconnect = True
self.print_error("connection closed remotely")
else:
t@@ -323,9 +321,8 @@ class TcpInterface(threading.Thread):
self.maybe_ping()
self.send_requests()
self.get_and_process_response()
- if self.needs_shutdown:
- s.shutdown(socket.SHUT_RDWR)
- s.close()
+ s.shutdown(socket.SHUT_RDWR)
+ s.close()
# Also for the s is None case
self._status = CS_FAILED
DIR diff --git a/lib/util.py b/lib/util.py
t@@ -360,8 +360,7 @@ class SocketPipe:
traceback.print_exc(file=sys.stderr)
data = ''
- if not data:
- self.socket.close()
+ if not data: # Connection closed remotely
return None
self.message += data
self.recv_time = time.time()