mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
logging: do not log into the root logger
Deprecate `ipa_log_manager.root_logger` and replace all calls to it with module-level logger calls. Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
committed by
Martin Basti
parent
ab9d1e75fc
commit
7a482b7c72
@@ -118,6 +118,7 @@ targetattr REPLACES the current attributes, it does not add to them.
|
||||
|
||||
"""
|
||||
from copy import deepcopy
|
||||
import logging
|
||||
|
||||
import six
|
||||
|
||||
@@ -129,12 +130,13 @@ from ipalib import output
|
||||
from ipalib import _, ngettext
|
||||
from ipalib.plugable import Registry
|
||||
from .baseldap import gen_pkey_only_option, pkey_to_value
|
||||
from ipapython.ipa_log_manager import root_logger
|
||||
from ipapython.dn import DN
|
||||
|
||||
if six.PY3:
|
||||
unicode = str
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
register = Registry()
|
||||
|
||||
ACI_NAME_PREFIX_SEP = ":"
|
||||
@@ -394,7 +396,7 @@ def _convert_strings_to_acis(acistrs):
|
||||
try:
|
||||
acis.append(ACI(a))
|
||||
except SyntaxError:
|
||||
root_logger.warning("Failed to parse: %s" % a)
|
||||
logger.warning("Failed to parse: %s", a)
|
||||
return acis
|
||||
|
||||
def _find_aci_by_name(acis, aciprefix, aciname):
|
||||
|
||||
@@ -49,7 +49,6 @@ from ipalib.request import context
|
||||
from ipalib import output
|
||||
from ipapython import kerberos
|
||||
from ipapython.dn import DN
|
||||
from ipapython.ipa_log_manager import root_logger
|
||||
from ipaserver.plugins.service import normalize_principal, validate_realm
|
||||
|
||||
try:
|
||||
@@ -514,7 +513,7 @@ class BaseCertObject(Object):
|
||||
except Exception:
|
||||
# Invalid GeneralName (i.e. not a valid X.509 cert);
|
||||
# don't fail but log something about it
|
||||
root_logger.warning(
|
||||
logger.warning(
|
||||
"Encountered bad GeneralName; skipping", exc_info=True)
|
||||
|
||||
serial_number = obj.get('serial_number')
|
||||
|
||||
@@ -39,7 +39,6 @@ from .baseldap import (
|
||||
from .dns import dns_container_exists
|
||||
from ipapython.dn import DN
|
||||
from ipapython.ipautil import realm_to_suffix
|
||||
from ipapython.ipa_log_manager import root_logger
|
||||
from ipalib import api, Str, StrEnum, Password, Bool, _, ngettext, Int, Flag
|
||||
from ipalib import Command
|
||||
from ipalib import errors
|
||||
@@ -394,10 +393,10 @@ def add_range(myapi, trustinstance, range_name, dom_sid, *keys, **options):
|
||||
|
||||
if not info_list:
|
||||
# We were unable to gain UNIX specific info from the AD
|
||||
root_logger.debug("Unable to gain POSIX info from the AD")
|
||||
logger.debug("Unable to gain POSIX info from the AD")
|
||||
else:
|
||||
if all(attr in info for attr in required_msSFU_attrs):
|
||||
root_logger.debug("Able to gain POSIX info from the AD")
|
||||
logger.debug("Able to gain POSIX info from the AD")
|
||||
range_type = u'ipa-ad-trust-posix'
|
||||
|
||||
max_uid = info.get('msSFU30MaxUidNumber')
|
||||
|
||||
Reference in New Issue
Block a user