AaronFiore/electrum
1
0
Fork 0
Code Activity

network: stop pending connections when stopping network

Browse Source
This commit is contained in:
SomberNight
2018-09-13 21:20:55 +02:00
parent 23f56ffa8a
commit 2e61359d50
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
electrum/network.py
View File

@@ -224,10 +224,11 @@ class Network(PrintError):
self.auto_connect = self.config.get('auto_connect', True) self.auto_connect = self.config.get('auto_connect', True)
self.connecting = set() self.connecting = set()
self.requested_chunks = set() self.requested_chunks = set()
self.socket_queue = queue.Queue() self.server_queue = None
self.server_queue_group = None
self.asyncio_loop = asyncio.get_event_loop()
self.start_network(deserialize_server(self.default_server)[2], self.start_network(deserialize_server(self.default_server)[2],
deserialize_proxy(self.config.get('proxy'))) deserialize_proxy(self.config.get('proxy')))
self.asyncio_loop = asyncio.get_event_loop()
@staticmethod @staticmethod
def get_instance(): def get_instance():
@@ -417,12 +418,12 @@ class Network(PrintError):
@with_interface_lock @with_interface_lock
def start_interface(self, server): def start_interface(self, server):
if (not server in self.interfaces and not server in self.connecting): if server not in self.interfaces and server not in self.connecting:
if server == self.default_server: if server == self.default_server:
self.print_error("connecting to %s as new interface" % server) self.print_error("connecting to %s as new interface" % server)
self.set_status('connecting') self.set_status('connecting')
self.connecting.add(server) self.connecting.add(server)
self.socket_queue.put(server) self.server_queue.put(server)
def start_random_interface(self): def start_random_interface(self):
with self.interface_lock: with self.interface_lock:
@@ -482,13 +483,24 @@ class Network(PrintError):
@with_interface_lock @with_interface_lock
def start_network(self, protocol: str, proxy: Optional[dict]): def start_network(self, protocol: str, proxy: Optional[dict]):
assert not self.interface and not self.interfaces assert not self.interface and not self.interfaces
assert not self.connecting and self.socket_queue.empty() assert not self.connecting and not self.server_queue
assert not self.server_queue_group
self.print_error('starting network') self.print_error('starting network')
self.disconnected_servers = set([]) # note: needs self.interface_lock self.disconnected_servers = set([]) # note: needs self.interface_lock
self.protocol = protocol self.protocol = protocol
self._init_server_queue()
self.set_proxy(proxy) self.set_proxy(proxy)
self.start_interface(self.default_server) self.start_interface(self.default_server)
def _init_server_queue(self):
self.server_queue = queue.Queue()
self.server_queue_group = server_queue_group = TaskGroup()
async def job():
forever = asyncio.Event()
async with server_queue_group as group:
await group.spawn(forever.wait())
asyncio.run_coroutine_threadsafe(job(), self.asyncio_loop)
@with_interface_lock @with_interface_lock
def stop_network(self): def stop_network(self):
self.print_error("stopping network") self.print_error("stopping network")
@@ -499,8 +511,13 @@ class Network(PrintError):
assert self.interface is None assert self.interface is None
assert not self.interfaces assert not self.interfaces
self.connecting.clear() self.connecting.clear()
self._stop_server_queue()
def _stop_server_queue(self):
# Get a new queue - no old pending connections thanks! # Get a new queue - no old pending connections thanks!
self.socket_queue = queue.Queue() self.server_queue = None
asyncio.run_coroutine_threadsafe(self.server_queue_group.cancel_remaining(), self.asyncio_loop)
self.server_queue_group = None
def set_parameters(self, net_params: NetworkParameters): def set_parameters(self, net_params: NetworkParameters):
proxy = net_params.proxy proxy = net_params.proxy
@@ -768,9 +785,9 @@ class Network(PrintError):
async def maintain_sessions(self): async def maintain_sessions(self):
while True: while True:
while self.socket_queue.qsize() > 0: while self.server_queue.qsize() > 0:
server = self.socket_queue.get() server = self.server_queue.get()
asyncio.get_event_loop().create_task(self.new_interface(server)) await self.server_queue_group.spawn(self.new_interface(server))
remove = [] remove = []
for k, i in self.interfaces.items(): for k, i in self.interfaces.items():
if i.fut.done() and not i.exception: if i.fut.done() and not i.exception: