Merge branch 'master' of git://github.com/spesmilo/electrum
This commit is contained in:
commit
292a569991
Binary file not shown.
Before Width: | Height: | Size: 283 KiB After Width: | Height: | Size: 17 KiB |
Binary file not shown.
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 9.1 KiB |
|
@ -378,7 +378,7 @@ class Network(threading.Thread):
|
||||||
i, response = self.queue.get(timeout=0.1)
|
i, response = self.queue.get(timeout=0.1)
|
||||||
except Queue.Empty:
|
except Queue.Empty:
|
||||||
|
|
||||||
if len(self.interfaces) < self.num_server:
|
if len(self.interfaces) + len(self.pending_servers) < self.num_server:
|
||||||
self.start_random_interface()
|
self.start_random_interface()
|
||||||
if not self.interfaces:
|
if not self.interfaces:
|
||||||
if time.time() - self.disconnected_time > DISCONNECTED_RETRY_INTERVAL:
|
if time.time() - self.disconnected_time > DISCONNECTED_RETRY_INTERVAL:
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -52,7 +52,7 @@ data_files += [
|
||||||
])
|
])
|
||||||
]
|
]
|
||||||
|
|
||||||
# replace tlslite
|
# replace tlslite because of https://github.com/trevp/tlslite/issues/15
|
||||||
os.system("pip install http://download.electrum.org/tlslite-0.4.5.tar.gz")
|
os.system("pip install http://download.electrum.org/tlslite-0.4.5.tar.gz")
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
|
|
Loading…
Reference in New Issue