notwa/respodns
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

detect and handle task cancellations semi-properly

Browse Source
This commit is contained in:
Connor Olding 2021-08-11 18:49:47 -07:00
parent 7d2637c1ad
commit d2d4917a53
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
respodns/dns.py
View File

@ -113,7 +113,7 @@ def process_result(res, ip, check, opts: Options):
async def try_ip(db, server_ip, checks, opts: Options): async def try_ip(db, server_ip, checks, opts: Options):
from .util import make_pooler from .util import make_pooler
from asyncio import sleep from asyncio import sleep, CancelledError
entries = [] entries = []
deferred = [] deferred = []
@ -130,7 +130,11 @@ async def try_ip(db, server_ip, checks, opts: Options):
def finisher(done, pending): def finisher(done, pending):
nonlocal success nonlocal success
for task in done: for task in done:
res, ip, check = task.result() try:
res, ip, check = task.result()
except CancelledError:
success = False
break
entry = process_result(res, ip, check, opts) entry = process_result(res, ip, check, opts)
map(maybe_put_ip, entry.addrs) map(maybe_put_ip, entry.addrs)
entries.append(entry) entries.append(entry)