YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1233 from YunoHost/fix-bad-timeout-dig

Browse source 
[fix] Diagnosis dns query taking an awful amount of time because of timeout
This commit is contained in:
Alexandre Aubin 2021-05-24 15:37:12 +02:00 • committed by GitHub
commit 55a3313bb9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/templates/dnsmasq/plain/resolv.dnsmasq.conf
View file

@ -23,11 +23,6 @@ nameserver 185.233.100.100
nameserver 2a0c:e300::100 nameserver 2a0c:e300::100
nameserver 185.233.100.101 nameserver 185.233.100.101
nameserver 2a0c:e300::101 nameserver 2a0c:e300::101
# (FR) gozmail / grifon
nameserver 80.67.190.200
nameserver 2a00:5884:8218::1
# (DE) FoeBud / Digital Courage
nameserver 85.214.20.141
# (DE) CCC Berlin # (DE) CCC Berlin
nameserver 195.160.173.53 nameserver 195.160.173.53
# (DE) AS250 # (DE) AS250

10
src/yunohost/utils/network.py
View file

@ -169,7 +169,15 @@ def dig(
resolver = dns.resolver.Resolver(configure=False) resolver = dns.resolver.Resolver(configure=False)
resolver.use_edns(0, 0, edns_size) resolver.use_edns(0, 0, edns_size)
resolver.nameservers = resolvers resolver.nameservers = resolvers
resolver.timeout = timeout # resolver.timeout is used to trigger the next DNS query on resolvers list.
# In python-dns 1.16, this value is set to 2.0. However, this means that if
# the 3 first dns resolvers in list are down, we wait 6 seconds before to
# run the DNS query to a DNS resolvers up...
# In diagnosis dnsrecords, with 10 domains this means at least 12min, too long.
resolver.timeout = 1.0
# resolver.lifetime is the timeout for resolver.query()
# By default set it to 5 seconds to allow 4 resolvers to be unreachable.
resolver.lifetime = timeout
try: try:
answers = resolver.query(qname, rdtype) answers = resolver.query(qname, rdtype)
except ( except (