Merge lp:~colin-nicholson/swift/cname_exception_bug into lp:~hudson-openstack/swift/trunk

[Colin Nicholson]

During a CNAME lookup, exception NXDOMAIN isn't caught by the check for DNSException, so need to also check for it.

[lp:~colin-nicholson/swift/cname_exception_bug]

189. By Colin Nicholson on 2011-01-20

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

[John Dickinson (notmyname)]

NXDOMAIN is raised when an IP is used as the host header. that is fixed

NoAnswer is raised if the CNAME record doesn't exist. that is fixed

review: Approve

[Chuck Thier (cthier)]

Cool

review: Approve

=== modified file 'swift/common/middleware/cname_lookup.py'
--- swift/common/middleware/cname_lookup.py	2011-01-14 08:45:39 +0000
+++ swift/common/middleware/cname_lookup.py	2011-01-20 20:53:25 +0000
@@ -17,6 +17,7 @@
 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 @@
         result = answer.items[0].to_text()
         result = result.rstrip('.')
         return ttl, result
-    except DNSException:
+    except (DNSException, NXDOMAIN, NoAnswer):
         return 0, None