tfix: use request_time for interface timeout - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 8656785aa75519a7cd9307da3945152b2efe1f20
DIR parent 45fd3ef3436eb5122fac87daba2a9f0a8c38a695
HTML Author: ThomasV <thomasv@gitorious>
Date: Wed, 6 May 2015 17:25:29 +0200
fix: use request_time for interface timeout
Diffstat:
M lib/interface.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
DIR diff --git a/lib/interface.py b/lib/interface.py
t@@ -62,7 +62,7 @@ class TcpInterface(threading.Thread):
self.request_queue = Queue.Queue()
self.unanswered_requests = {}
# request timeouts
- self.response_time = time.time()
+ self.request_time = time.time()
self.ping_time = time.time()
# parse server
self.server = server
t@@ -249,6 +249,7 @@ class TcpInterface(threading.Thread):
def send_request(self, request, response_queue = None):
'''Queue a request. Blocking only if called from other threads.'''
+ self.request_time = time.time()
self.request_queue.put((request, response_queue), threading.current_thread() != self)
def send_requests(self):
t@@ -285,7 +286,7 @@ class TcpInterface(threading.Thread):
self.send_request({'method':'server.version', 'params':[ELECTRUM_VERSION, PROTOCOL_VERSION]})
self.ping_time = time.time()
# stop interface if we have been waiting for more than 10 seconds
- if self.unanswered_requests and time.time() - self.response_time > 10:
+ if self.unanswered_requests and time.time() - self.request_time > 10:
self.print_error("interface timeout", len(self.unanswered_requests))
self.stop()
t@@ -293,7 +294,6 @@ class TcpInterface(threading.Thread):
if self.is_connected():
try:
response = self.pipe.get()
- self.response_time = time.time()
except util.timeout:
return
# If remote side closed the socket, SocketPipe closes our socket and returns None