mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-22 21:00:22 -07:00
Include error exception in AnsibleError
- Use to_native instead of str Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
parent
cce133b14f
commit
f9b836a901
5 changed files with 11 additions and 9 deletions
|
@ -19,6 +19,7 @@ __metaclass__ = type
|
|||
|
||||
from ansible.errors import AnsibleError
|
||||
from ansible.plugins.lookup import LookupBase
|
||||
from ansible.module_utils._text import to_native
|
||||
import socket
|
||||
|
||||
try:
|
||||
|
@ -146,7 +147,7 @@ class LookupModule(LookupBase):
|
|||
nsaddr = dns.resolver.query(ns)[0].address
|
||||
nameservers.append(nsaddr)
|
||||
except Exception as e:
|
||||
raise AnsibleError("dns lookup NS: ", str(e))
|
||||
raise AnsibleError("dns lookup NS: %s" % to_native(e))
|
||||
myres.nameservers = nameservers
|
||||
continue
|
||||
if '=' in t:
|
||||
|
@ -163,7 +164,7 @@ class LookupModule(LookupBase):
|
|||
try:
|
||||
rdclass = dns.rdataclass.from_text(arg)
|
||||
except Exception as e:
|
||||
raise errors.AnsibleError("dns lookup illegal CLASS: ", str(e))
|
||||
raise AnsibleError("dns lookup illegal CLASS: %s" % to_native(e))
|
||||
|
||||
continue
|
||||
|
||||
|
@ -186,7 +187,7 @@ class LookupModule(LookupBase):
|
|||
except dns.exception.SyntaxError:
|
||||
pass
|
||||
except Exception as e:
|
||||
raise AnsibleError("dns.reversename unhandled exception", str(e))
|
||||
raise AnsibleError("dns.reversename unhandled exception %s" % to_native(e))
|
||||
|
||||
try:
|
||||
answers = myres.query(domain, qtype, rdclass=rdclass)
|
||||
|
@ -216,6 +217,6 @@ class LookupModule(LookupBase):
|
|||
except dns.resolver.Timeout:
|
||||
ret.append('')
|
||||
except dns.exception.DNSException as e:
|
||||
raise AnsibleError("dns.resolver unhandled exception", e)
|
||||
raise AnsibleError("dns.resolver unhandled exception %s" % to_native(e))
|
||||
|
||||
return ret
|
||||
|
|
|
@ -27,6 +27,7 @@ except ImportError:
|
|||
|
||||
from ansible.errors import AnsibleError
|
||||
from ansible.plugins.lookup import LookupBase
|
||||
from ansible.module_utils._text import to_native
|
||||
|
||||
# ==============================================================
|
||||
# DNSTXT: DNS TXT records
|
||||
|
@ -57,7 +58,7 @@ class LookupModule(LookupBase):
|
|||
except dns.resolver.Timeout:
|
||||
string = ''
|
||||
except DNSException as e:
|
||||
raise AnsibleError("dns.resolver unhandled exception", e)
|
||||
raise AnsibleError("dns.resolver unhandled exception %s" % to_native(e))
|
||||
|
||||
ret.append(''.join(string))
|
||||
|
||||
|
|
|
@ -178,7 +178,7 @@ class LookupModule(LookupBase):
|
|||
yield formatted
|
||||
except (ValueError, TypeError):
|
||||
raise AnsibleError(
|
||||
"problem formatting %r with %r" % self.format
|
||||
"problem formatting %r with %r" % (i, self.format)
|
||||
)
|
||||
|
||||
def run(self, terms, variables, **kwargs):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue