[checkmk-commits] LDAP discovery log: Use ldap logger

Module: check_mk Branch: master Commit: 1a84c24ada6851e477a0563ade49fdbcfbf4c1e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a84c24ada6851… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 8 11:54:51 2017 +0200 LDAP discovery log: Use ldap logger Change-Id: I7996cf1c15e3be8936ed5eb66e163ab66336ebfd --- web/plugins/userdb/ldap.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 644d037..4371739 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -47,7 +47,7 @@ import time import copy import cmk.paths -from log import logger +import log try: # docs: http://www.python-ldap.org/doc/html/index.html @@ -178,7 +178,7 @@ class LDAPUserConnector(UserConnector): self._ldap_obj = None self._ldap_obj_config = None - self._ldap_logger = logger.getChild("ldap") + self._logger = log.logger.getChild("ldap") self._user_cache = {} self._group_cache = {} @@ -215,8 +215,9 @@ class LDAPUserConnector(UserConnector): return self._config['id'] + # TODO: Clean this up and make log calls different log levels def log(self, s): - self._ldap_logger.debug('LDAP [%s]: %s' % (self.id(), s)) + self._logger.debug('LDAP [%s]: %s' % (self.id(), s)) def connect_server(self, server): @@ -320,9 +321,9 @@ class LDAPUserConnector(UserConnector): def _discover_nearest_dc(self, domain): - import ad, log + import ad locator = ad.Locator() - locator.m_logger = log.logger + locator.m_logger = self.logger try: server = locator.locate(domain) self.log(' DISCOVERY: Discovered server %r from %r' % (server, domain))