mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Use root_logger for verify_host_resolvable()
After discussion with Martin Basti we decided to standardize on root_logger
with hope that one day we will use root_logger.getLogger('module')
to make logging prettier and tunable per module.
https://fedorahosted.org/freeipa/ticket/5710
Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
committed by
Martin Basti
parent
0c75df4bf3
commit
ec49130b94
@@ -1753,7 +1753,7 @@ def get_server_connection_interface(server):
|
||||
def client_dns(server, hostname, options):
|
||||
|
||||
try:
|
||||
verify_host_resolvable(hostname, root_logger)
|
||||
verify_host_resolvable(hostname)
|
||||
dns_ok = True
|
||||
except errors.DNSNotARecordError:
|
||||
root_logger.warning("Hostname (%s) does not have A/AAAA record.",
|
||||
|
||||
@@ -830,7 +830,7 @@ def enforce_host_existence(host, message=None):
|
||||
return
|
||||
|
||||
try:
|
||||
verify_host_resolvable(host, root_logger)
|
||||
verify_host_resolvable(host)
|
||||
except errors.DNSNotARecordError as ex:
|
||||
if message is None:
|
||||
message = "Unknown host %s: %s" % (host, ex)
|
||||
|
||||
@@ -1657,7 +1657,7 @@ def check_ns_rec_resolvable(zone, name, log):
|
||||
# this is a DNS name relative to the zone
|
||||
name = name.derelativize(zone.make_absolute())
|
||||
try:
|
||||
verify_host_resolvable(name, log)
|
||||
verify_host_resolvable(name)
|
||||
except errors.DNSNotARecordError:
|
||||
raise errors.NotFound(
|
||||
reason=_('Nameserver \'%(host)s\' does not have a corresponding '
|
||||
@@ -4286,7 +4286,7 @@ class dns_resolve(Command):
|
||||
query=args[0]
|
||||
|
||||
try:
|
||||
verify_host_resolvable(query, self.log)
|
||||
verify_host_resolvable(query)
|
||||
except errors.DNSNotARecordError:
|
||||
raise errors.NotFound(
|
||||
reason=_('Host \'%(host)s\' not found') % {'host': query}
|
||||
|
||||
@@ -633,7 +633,7 @@ class host_add(LDAPCreate):
|
||||
check_forward=True,
|
||||
check_reverse=check_reverse)
|
||||
if not options.get('force', False) and not 'ip_address' in options:
|
||||
util.verify_host_resolvable(keys[-1], self.log)
|
||||
util.verify_host_resolvable(keys[-1])
|
||||
if 'locality' in entry_attrs:
|
||||
entry_attrs['l'] = entry_attrs['locality']
|
||||
entry_attrs['cn'] = keys[-1]
|
||||
|
||||
@@ -566,7 +566,7 @@ class service_add(LDAPCreate):
|
||||
# We know the host exists if we've gotten this far but we
|
||||
# really want to discourage creating services for hosts that
|
||||
# don't exist in DNS.
|
||||
util.verify_host_resolvable(hostname, self.log)
|
||||
util.verify_host_resolvable(hostname)
|
||||
if not 'managedby' in entry_attrs:
|
||||
entry_attrs['managedby'] = hostresult['dn']
|
||||
|
||||
|
||||
@@ -43,6 +43,7 @@ from ipapython.ssh import SSHPublicKey
|
||||
from ipapython.dn import DN, RDN
|
||||
from ipapython.dnsutil import DNSName
|
||||
from ipapython.graph import Graph
|
||||
from ipapython.ipa_log_manager import root_logger
|
||||
|
||||
if six.PY3:
|
||||
unicode = str
|
||||
@@ -64,7 +65,8 @@ def json_serialize(obj):
|
||||
return ''
|
||||
return json_serialize(obj.__json__())
|
||||
|
||||
def verify_host_resolvable(fqdn, log):
|
||||
|
||||
def verify_host_resolvable(fqdn):
|
||||
"""
|
||||
See if the hostname has a DNS A/AAAA record.
|
||||
"""
|
||||
@@ -75,12 +77,12 @@ def verify_host_resolvable(fqdn, log):
|
||||
for rdtype in ('A', 'AAAA'):
|
||||
try:
|
||||
answers = resolver.query(fqdn, rdtype)
|
||||
log.debug(
|
||||
root_logger.debug(
|
||||
'IPA: found %d %s records for %s: %s' % (len(answers),
|
||||
rdtype, fqdn, ' '.join(str(answer) for answer in answers))
|
||||
)
|
||||
except DNSException:
|
||||
log.debug(
|
||||
root_logger.debug(
|
||||
'IPA: DNS %s record lookup failed for %s' %
|
||||
(rdtype, fqdn)
|
||||
)
|
||||
|
||||
@@ -878,7 +878,7 @@ class BindInstance(service.Service):
|
||||
if not dns_zone_exists(zone, self.api):
|
||||
# check if master hostname is resolvable
|
||||
try:
|
||||
verify_host_resolvable(fqdn, root_logger)
|
||||
verify_host_resolvable(fqdn)
|
||||
except errors.DNSNotARecordError:
|
||||
root_logger.warning("Master FQDN (%s) is not resolvable.",
|
||||
fqdn)
|
||||
|
||||
@@ -1064,7 +1064,7 @@ def add_a_records_for_hosts_in_master_domain(master):
|
||||
# We don't need to take care of the zone creation since it is master
|
||||
# domain
|
||||
try:
|
||||
verify_host_resolvable(host.hostname, log)
|
||||
verify_host_resolvable(host.hostname)
|
||||
log.debug("The host (%s) is resolvable." % host.domain.name)
|
||||
except errors.DNSNotARecordError:
|
||||
log.debug("Hostname (%s) does not have A/AAAA record. Adding new one.",
|
||||
|
||||
Reference in New Issue
Block a user