AaronFiore/electrum
1
0
Fork 0
Code Activity

Remove interfaces in one place only

Browse Source 
switch_to_random_interface used to do is_connected()
checks and remove interfaces when switching.  This
is redundant: interfaces are only added to self.interfaces
once in is_connected() state from process_if_notification().
When they are disconnected, a notification is also received
and process_if_notification() performs the removal.  Furthermore,
two other callers of switch_to_interface do not do explicit
is_connected() checks before calling it.
This commit is contained in:
Neil Booth
2015-05-22 15:01:11 +09:00
parent 20ee265683
commit 274965468e
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/network.py
View File

@@ -346,13 +346,9 @@ class Network(util.DaemonThread):
def switch_to_random_interface(self): def switch_to_random_interface(self):
while self.interfaces: if self.interfaces:
i = random.choice(self.interfaces.values()) server = random.choice(self.interfaces.keys())
if i.is_connected(): self.switch_to_interface(server)
self.switch_to_interface(i.server)
break
else:
self.remove_interface(i)
def switch_to_interface(self, server): def switch_to_interface(self, server):
'''Switch to server as our interface, it must be in self.interfaces''' '''Switch to server as our interface, it must be in self.interfaces'''
@@ -501,8 +497,7 @@ class Network(util.DaemonThread):
# main interface # main interface
if not self.is_connected(): if not self.is_connected():
if self.config.get('auto_cycle'): if self.config.get('auto_cycle'):
if self.interfaces: self.switch_to_random_interface()
self.switch_to_random_interface()
else: else:
if self.default_server in self.interfaces.keys(): if self.default_server in self.interfaces.keys():
self.switch_to_interface(self.default_server) self.switch_to_interface(self.default_server)