During a CNAME lookup, exception NXDOMAIN isn't caught by the check for DNSException, so need to also check for it.
This commit is contained in:
commit
d32def26fc
@ -17,6 +17,7 @@ from webob import Request
|
||||
from webob.exc import HTTPBadRequest
|
||||
import dns.resolver
|
||||
from dns.exception import DNSException
|
||||
from dns.resolver import NXDOMAIN, NoAnswer
|
||||
|
||||
from swift.common.utils import cache_from_env, get_logger
|
||||
|
||||
@ -34,7 +35,7 @@ def lookup_cname(domain): # pragma: no cover
|
||||
result = answer.items[0].to_text()
|
||||
result = result.rstrip('.')
|
||||
return ttl, result
|
||||
except DNSException:
|
||||
except (DNSException, NXDOMAIN, NoAnswer):
|
||||
return 0, None
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user