BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Put getting of auto_cycle into one place. 

Default to False consistently; this may change the behaviour of
network.py's get_parameters().
This commit is contained in:
Neil Booth 2015-05-25 14:09:43 +09:00
parent 778297697a
commit 4f6d2f3d32
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gui/text.py
View File

@ -352,7 +352,6 @@ class ElectrumGui:
def network_dialog(self): def network_dialog(self):
if not self.network: return if not self.network: return
auto_connect = self.network.config.get('auto_cycle')
host, port, protocol, proxy_config, auto_connect = self.network.get_parameters() host, port, protocol, proxy_config, auto_connect = self.network.get_parameters()
srv = 'auto-connect' if auto_connect else self.network.default_server srv = 'auto-connect' if auto_connect else self.network.default_server

12
lib/network.py
View File

@ -249,8 +249,10 @@ class Network(util.DaemonThread):
def get_parameters(self): def get_parameters(self):
host, port, protocol = deserialize_server(self.default_server) host, port, protocol = deserialize_server(self.default_server)
auto_connect = self.config.get('auto_cycle', True) return host, port, protocol, self.proxy, self.auto_connect()
return host, port, protocol, self.proxy, auto_connect
def auto_connect(self):
return self.config.get('auto_cycle', False)
def get_interfaces(self): def get_interfaces(self):
return self.interfaces.keys() return self.interfaces.keys()
@ -382,7 +384,7 @@ class Network(util.DaemonThread):
if self.is_connected(): if self.is_connected():
if self.server_is_lagging(): if self.server_is_lagging():
self.print_error("Server is lagging", blockchain_height, self.get_server_height()) self.print_error("Server is lagging", blockchain_height, self.get_server_height())
if self.config.get('auto_cycle'): if self.auto_connect():
self.set_server(i.server) self.set_server(i.server)
self.notify('updated') self.notify('updated')
@ -481,7 +483,7 @@ class Network(util.DaemonThread):
self.nodes_retry_time = now self.nodes_retry_time = now
# main interface # main interface
if not self.is_connected(): if not self.is_connected():
if self.config.get('auto_cycle'): if self.auto_connect():
self.switch_to_random_interface() self.switch_to_random_interface()
else: else:
if self.default_server in self.disconnected_servers: if self.default_server in self.disconnected_servers:
@ -524,7 +526,7 @@ class Network(util.DaemonThread):
self.blockchain.queue.put((i,result)) self.blockchain.queue.put((i,result))
if i == self.interface: if i == self.interface:
if self.server_is_lagging() and self.config.get('auto_cycle'): if self.server_is_lagging() and self.auto_connect():
self.print_error("Server lagging, stopping interface") self.print_error("Server lagging, stopping interface")
self.stop_interface() self.stop_interface()
self.notify('updated') self.notify('updated')