tnetwork: when interface is disconnected, clear cache and resend unanswered requests - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 44f06de7969bf0dbcbb806e3a6449f4dc1084127
DIR parent e927766698475017ce4432c65c83c9c6028aad10
HTML Author: ThomasV <thomasv@gitorious>
Date: Fri, 15 May 2015 14:47:59 +0200
network: when interface is disconnected, clear cache and resend unanswered requests
Diffstat:
M lib/network.py | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
---
DIR diff --git a/lib/network.py b/lib/network.py
t@@ -162,10 +162,12 @@ class Network(util.DaemonThread):
if not os.path.exists(dir_path):
os.mkdir(dir_path)
- # address subscriptions
- self.addresses = set()
- # cached results
+ # subscriptions and requests
+ self.subscribed_addresses = set()
+ # cached address status
self.addr_responses = {}
+ # unanswered requests
+ self.unanswered_requests = {}
self.connection_status = 'connecting'
self.requests_queue = Queue.Queue()
t@@ -215,9 +217,13 @@ class Network(util.DaemonThread):
return self.interface and self.interface.is_connected()
def send_subscriptions(self):
- self.print_error('sending subscriptions to', self.interface.server, len(self.addresses))
- for addr in self.addresses:
- self.interface.send_request({'method':'blockchain.address.subscribe', 'params':[addr]})
+ # clear cache
+ self.cached_responses = {}
+ self.print_error('sending subscriptions to', self.interface.server, len(self.unanswered_requests), len(self.subscribed_addresses))
+ for r in self.unanswered_requests.values():
+ self.interface.send_request(r)
+ for addr in self.subscribed_addresses:
+ self.interface.send_request({'method':'blockchain.address.subscribe','params':[addr]})
self.interface.send_request({'method':'server.banner','params':[]})
self.interface.send_request({'method':'server.peers.subscribe','params':[]})
t@@ -411,6 +417,10 @@ class Network(util.DaemonThread):
def process_response(self, i, response):
+ # the id comes from the daemon or the network proxy
+ _id = response.get('id')
+ if _id is not None:
+ self.unanswered_requests.pop(_id)
method = response['method']
if method == 'blockchain.address.subscribe':
self.on_address(i, response)
t@@ -448,13 +458,14 @@ class Network(util.DaemonThread):
out['error'] = str(e)
traceback.print_exc(file=sys.stdout)
self.print_error("network error", str(e))
-
self.response_queue.put(out)
return
+ # store request
+ self.unanswered_requests[_id] = request
if method == 'blockchain.address.subscribe':
addr = params[0]
- self.addresses.add(addr)
+ self.subscribed_addresses.add(addr)
if addr in self.addr_responses:
self.response_queue.put({'id':_id, 'result':self.addr_responses[addr]})
return