saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #53653 from s0undt3ch/hotfix/fix-nox-bypass-2019.2.1

Browse source 
[2019.2.1] Log which address failed to resolve
This commit is contained in:
Pedro Algarvio 2019-07-05 19:29:30 +01:00 • committed by GitHub
commit 8f05226fd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/grains/core.py
View file

@ -2210,7 +2210,7 @@ def fqdns():
interface_data=_INTERFACES)
addresses.extend(salt.utils.network.ip_addrs6(include_loopback=False,
interface_data=_INTERFACES))
err_message = 'Exception during resolving address: %s'
err_message = 'An exception occurred resolving address \'%s\': %s'
for ip in addresses:
try:
fqdns.add(socket.getfqdn(socket.gethostbyaddr(ip)[0]))
@ -2219,9 +2219,9 @@ def fqdns():
# No FQDN for this IP address, so we don't need to know this all the time.
log.debug("Unable to resolve address %s: %s", ip, err)
else:
log.error(err_message, err)
log.error(err_message, ip, err)
except (socket.error, socket.gaierror, socket.timeout) as err:
log.error(err_message, err)
log.error(err_message, ip, err)
grains['fqdns'] = sorted(list(fqdns))
return grains