openstack/swift
Code Issues Proposed changes

Merged lp:~notmyname/swift/cname_exception_bug - added NoAnswer error catching

Browse Source
This commit is contained in:
Colin Nicholson 2011-01-20 20:44:51 +00:00
commit 1ab9614bfb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swift/common/middleware/cname_lookup.py
View File

@ -17,7 +17,7 @@ from webob import Request
from webob.exc import HTTPBadRequest from webob.exc import HTTPBadRequest
import dns.resolver import dns.resolver
from dns.exception import DNSException from dns.exception import DNSException
from dns.resolver import NXDOMAIN from dns.resolver import NXDOMAIN, NoAnswer
from swift.common.utils import cache_from_env, get_logger from swift.common.utils import cache_from_env, get_logger
@ -35,7 +35,7 @@ def lookup_cname(domain): # pragma: no cover
result = answer.items[0].to_text() result = answer.items[0].to_text()
result = result.rstrip('.') result = result.rstrip('.')
return ttl, result return ttl, result
except (DNSException, NXDOMAIN): except (DNSException, NXDOMAIN, NoAnswer):
return 0, None return 0, None