AaronFiore/electrum
1
0
Fork 0
Code Activity

network.maintain_sessions: rm redundant 'update' notifications

Browse Source
This commit is contained in:
SomberNight
2018-09-09 05:32:07 +02:00
parent e3fb991b1b
commit 096b3e6026
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
electrum/network.py
View File

@@ -840,16 +840,13 @@ class Network(PrintError):
except BaseException as e: except BaseException as e:
self.print_error(i.server, "errored because:", str(e), str(type(e))) self.print_error(i.server, "errored because:", str(e), str(type(e)))
remove.append(k) remove.append(k)
changed = False
for k in remove: for k in remove:
self.connection_down(k) self.connection_down(k)
changed = True
# nodes # nodes
now = time.time() now = time.time()
for i in range(self.num_server - len(self.interfaces) - len(self.connecting)): for i in range(self.num_server - len(self.interfaces) - len(self.connecting)):
if self.start_random_interface(): self.start_random_interface()
changed = True
if now - self.nodes_retry_time > NODES_RETRY_INTERVAL: if now - self.nodes_retry_time > NODES_RETRY_INTERVAL:
self.print_error('network: retrying connections') self.print_error('network: retrying connections')
self.disconnected_servers = set([]) self.disconnected_servers = set([])
@@ -860,23 +857,18 @@ class Network(PrintError):
if self.auto_connect: if self.auto_connect:
if not self.is_connecting(): if not self.is_connecting():
self.switch_to_random_interface() self.switch_to_random_interface()
changed = True
else: else:
if self.default_server in self.disconnected_servers: if self.default_server in self.disconnected_servers:
if now - self.server_retry_time > SERVER_RETRY_INTERVAL: if now - self.server_retry_time > SERVER_RETRY_INTERVAL:
self.disconnected_servers.remove(self.default_server) self.disconnected_servers.remove(self.default_server)
self.server_retry_time = now self.server_retry_time = now
changed = True
else: else:
self.switch_to_interface(self.default_server) self.switch_to_interface(self.default_server)
changed = True
else: else:
if self.config.is_fee_estimates_update_required(): if self.config.is_fee_estimates_update_required():
await self.interface.group.spawn(self.attempt_fee_estimate_update()) await self.interface.group.spawn(self.attempt_fee_estimate_update())
if changed: await asyncio.sleep(0.1)
self.notify('updated')
await asyncio.sleep(1)
async def attempt_fee_estimate_update(self): async def attempt_fee_estimate_update(self):
await asyncio.wait_for(self.request_fee_estimates(self.interface), 5) await asyncio.wait_for(self.request_fee_estimates(self.interface), 5)