cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1592 from jpmens/lookup_dnstxt3

Browse source 
$LOOKUP(dnstxt): handle exceptions
This commit is contained in:
Michael DeHaan 2012-11-10 08:52:30 -08:00
commit 40e49b6a5a
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/runner/lookup_plugins/dnstxt.py
View file

@ -20,6 +20,7 @@ import os
HAVE_DNS=False HAVE_DNS=False
try: try:
import dns.resolver import dns.resolver
from dns.exception import DNSException
HAVE_DNS=True HAVE_DNS=True
except ImportError: except ImportError:
pass pass
@ -43,9 +44,17 @@ class LookupModule(object):
domain = terms.split()[0] domain = terms.split()[0]
string = [] string = []
try:
answers = dns.resolver.query(domain, 'TXT') answers = dns.resolver.query(domain, 'TXT')
for rdata in answers: for rdata in answers:
s = rdata.to_text() s = rdata.to_text()
string.append(s[1:-1]) # Strip outside quotes on TXT rdata string.append(s[1:-1]) # Strip outside quotes on TXT rdata
except dns.resolver.NXDOMAIN:
string = 'NXDOMAIN'
except dns.resolver.Timeout:
string = ''
except dns.exception.DNSException as e:
raise errors.AnsibleError("dns.resolver unhandled exception", e)
return ''.join(string) return ''.join(string)