diff options
author | Brian Dolbec <dolsen@gentoo.org> | 2014-12-25 11:08:02 -0800 |
---|---|---|
committer | Brian Dolbec <dolsen@gentoo.org> | 2014-12-25 11:08:02 -0800 |
commit | a57687cb1d083e056bfbefad55d69f5607bffd1c (patch) | |
tree | 2687cc199c82dcffca8789ef0bf46fe1bca135f5 /gkeys-ldap | |
parent | gkeys-ldap: Pass in our logger instance to LdapSearch class (diff) | |
download | gentoo-keys-a57687cb1d083e056bfbefad55d69f5607bffd1c.tar.gz gentoo-keys-a57687cb1d083e056bfbefad55d69f5607bffd1c.tar.bz2 gentoo-keys-a57687cb1d083e056bfbefad55d69f5607bffd1c.zip |
gkeys-ldap: Pass in our logger to LdapConnect class
Diffstat (limited to 'gkeys-ldap')
-rw-r--r-- | gkeys-ldap/gkeyldap/connect.py | 18 | ||||
-rw-r--r-- | gkeys-ldap/gkeyldap/search.py | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/gkeys-ldap/gkeyldap/connect.py b/gkeys-ldap/gkeyldap/connect.py index 74e393c..6c80e4f 100644 --- a/gkeys-ldap/gkeyldap/connect.py +++ b/gkeys-ldap/gkeyldap/connect.py @@ -14,15 +14,15 @@ except ImportError: raise -from gkeys.log import logger from gkeyldap.config import default_server class LdapConnect(object): '''Class to connect on the configured LDAP server''' - def __init__(self, server=None): + def __init__(self, server=None, logger=None): self.server = server or default_server - logger.debug('LdapConnect: __init__; server...: %s' % self.server) + self.logger = logger + self.logger.debug('LdapConnect: __init__; server...: %s' % self.server) self.ldap_connection = None def connect(self, server=None, action='LDAP'): @@ -30,21 +30,21 @@ class LdapConnect(object): @param server: string URI path for the LDAP server ''' - logger.info("%s... Establishing connection" % action) + self.logger.info("%s... Establishing connection" % action) if server: self.server = server - logger.debug('LdapConnect: connect; new server: %s' % self.server) + self.logger.debug('LdapConnect: connect; new server: %s' % self.server) try: self.ldap_connection = ldap.initialize(self.server) self.ldap_connection.set_option(ldap.OPT_X_TLS_DEMAND, True) self.ldap_connection.start_tls_s() self.ldap_connection.simple_bind_s() except Exception as e: - logger.error( + self.logger.error( 'LdapConnect: connect; failed to connect to server: %s' % self.server) - logger.error("Exception was: %s" % str(e)) - logger.error("Aborting %s... Connection failed" % action) + self.logger.error("Exception was: %s" % str(e)) + self.logger.error("Aborting %s... Connection failed" % action) return False - logger.debug( + self.logger.debug( 'LdapConnect: connect; connection: %s' % self.ldap_connection) return self.ldap_connection diff --git a/gkeys-ldap/gkeyldap/search.py b/gkeys-ldap/gkeyldap/search.py index 708c2e2..1bce9e1 100644 --- a/gkeys-ldap/gkeyldap/search.py +++ b/gkeys-ldap/gkeyldap/search.py @@ -27,7 +27,7 @@ class LdapSearch(object): self.logger = logger self.logger.debug('LdapSearch: __init__; fields...: %s' % self.fields) self.logger.debug('LdapSearch: __init__; criteria.: %s' % self.criteria) - self.ldap_connection = LdapConnect().connect(action='Search') + self.ldap_connection = LdapConnect(logger=self.logger).connect(action='Search') self.status = True if not self.ldap_connection: self.status = False |