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:
Colin Nicholson 2011-01-21 16:27:07 +00:00 committed by Tarmac
commit d32def26fc

View File

@ -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