1
0

network: close interfaces more aggressively (abort after 2 seconds)

fixes #7083
This commit is contained in:
SomberNight
2021-03-04 17:47:49 +01:00
parent ff485cee62
commit 064670bd75
2 changed files with 9 additions and 3 deletions

View File

@@ -1220,7 +1220,8 @@ class Network(Logger, NetworkRetryManager[ServerAddr]):
async def _stop(self, full_shutdown=False):
self.logger.info("stopping network")
try:
await asyncio.wait_for(self.taskgroup.cancel_remaining(), timeout=2)
# note: cancel_remaining ~cannot be cancelled, it suppresses CancelledError
await asyncio.wait_for(self.taskgroup.cancel_remaining(log=True), timeout=2)
except (asyncio.TimeoutError, asyncio.CancelledError) as e:
self.logger.info(f"exc during main_taskgroup cancellation: {repr(e)}")
self.taskgroup = None