LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-27 15:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2239 from shsmith/master

Browse source 
fix #2204
This commit is contained in:
ThomasV 2017-03-06 12:30:27 +01:00 • committed by GitHub
commit ed2db4be80
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/network.py
View file

@ -334,14 +334,14 @@ class Network(util.DaemonThread):
for request in requests: for request in requests:
message_id = self.queue_request(request[0], request[1]) message_id = self.queue_request(request[0], request[1])
self.unanswered_requests[message_id] = request self.unanswered_requests[message_id] = request
for addr in self.subscribed_addresses:
self.queue_request('blockchain.address.subscribe', [addr])
self.queue_request('server.banner', []) self.queue_request('server.banner', [])
self.queue_request('server.donation_address', []) self.queue_request('server.donation_address', [])
self.queue_request('server.peers.subscribe', []) self.queue_request('server.peers.subscribe', [])
for i in bitcoin.FEE_TARGETS: for i in bitcoin.FEE_TARGETS:
self.queue_request('blockchain.estimatefee', [i]) self.queue_request('blockchain.estimatefee', [i])
self.queue_request('blockchain.relayfee', []) self.queue_request('blockchain.relayfee', [])
for addr in self.subscribed_addresses:
self.queue_request('blockchain.address.subscribe', [addr])
def get_status_value(self, key): def get_status_value(self, key):
if key == 'status': if key == 'status':
@ -441,6 +441,8 @@ class Network(util.DaemonThread):
self.print_error("stopping network") self.print_error("stopping network")
for interface in self.interfaces.values(): for interface in self.interfaces.values():
self.close_interface(interface) self.close_interface(interface)
if self.interface:
self.close_interface(self.interface)
assert self.interface is None assert self.interface is None
assert not self.interfaces assert not self.interfaces
self.connecting = set() self.connecting = set()
@ -678,7 +680,8 @@ class Network(util.DaemonThread):
# Responses to connection attempts? # Responses to connection attempts?
while not self.socket_queue.empty(): while not self.socket_queue.empty():
server, socket = self.socket_queue.get() server, socket = self.socket_queue.get()
self.connecting.remove(server) if server in self.connecting:
self.connecting.remove(server)
if socket: if socket:
self.new_interface(server, socket) self.new_interface(server, socket)
else: else: