ticket 2022 - modify codebase to utilize IPALogManager, obsoletes logging

change default_logger_level to debug in configure_standard_logging

add new ipa_log_manager module, move log_mgr there, also export
root_logger from log_mgr.

change all log_manager imports to ipa_log_manager and change
log_manager.root_logger to root_logger.

add missing import for parse_log_level()

1 files changed, 16 insertions, 16 deletions

diff --git a/ipa-client/ipaclient/ipadiscovery.py b/ipa-client/ipaclient/ipadiscovery.py
index e786e98d8..94a04f39e 100644
--- a/ipa-client/ipaclient/ipadiscovery.py
+++ b/ipa-client/ipaclient/ipadiscovery.py
@@ -19,7 +19,7 @@
 
 import socket
 import os
-import logging
+from ipapython.ipa_log_manager import *
 import ipapython.dnsclient
 import tempfile
 import ldap
@@ -94,7 +94,7 @@ class IPADiscovery:
         """
         server = None
         while not server:
-            logging.debug("[ipadnssearchldap("+domain+")]")
+            root_logger.debug("[ipadnssearchldap("+domain+")]")
             server = self.ipadnssearchldap(domain)
             if server:
                 return (server, domain)
@@ -148,7 +148,7 @@ class IPADiscovery:
                 if not self.domain: #no ldap server found
                     return NO_LDAP_SERVER
             else:
-                logging.debug("[ipadnssearchldap]")
+                root_logger.debug("[ipadnssearchldap]")
                 self.server = self.ipadnssearchldap(domain)
                 if self.server:
                     self.domain = domain
@@ -161,7 +161,7 @@ class IPADiscovery:
             self.server = server
 
         #search for kerberos
-        logging.debug("[ipadnssearchkrb]")
+        root_logger.debug("[ipadnssearchkrb]")
         krbret = self.ipadnssearchkrb(self.domain)
         if not server and not krbret[0]:
             return REALM_NOT_FOUND
@@ -169,7 +169,7 @@ class IPADiscovery:
         self.realm = krbret[0]
         self.kdc = krbret[1]
 
-        logging.debug("[ipacheckldap]")
+        root_logger.debug("[ipacheckldap]")
         # check ldap now
         ldapret = self.ipacheckldap(self.server, self.realm)
 
@@ -180,12 +180,12 @@ class IPADiscovery:
         if ldapret[0] == NO_ACCESS_TO_LDAP and self.realm is None:
             # Assume realm is the same as domain.upper()
             self.realm = self.domain.upper()
-            logging.debug("Assuming realm is the same as domain: %s" % self.realm)
+            root_logger.debug("Assuming realm is the same as domain: %s" % self.realm)
 
         if ldapret[0] == NO_ACCESS_TO_LDAP and self.basedn is None:
             # Generate suffix from realm
             self.basedn = realm_to_suffix(self.realm)
-            logging.debug("Generate basedn from realm: %s" % self.basedn)
+            root_logger.debug("Generate basedn from realm: %s" % self.basedn)
 
         return ldapret[0]
 
@@ -223,12 +223,12 @@ class IPADiscovery:
             run(["/usr/bin/wget", "-O", "%s/ca.crt" % temp_ca_dir, "-T", "15", "-t", "2",
                  "http://%s/ipa/config/ca.crt" % format_netloc(thost)])
         except CalledProcessError, e:
-            logging.debug('Retrieving CA from %s failed.\n%s' % (thost, str(e)))
+            root_logger.debug('Retrieving CA from %s failed.\n%s' % (thost, str(e)))
             return [NOT_IPA_SERVER]
 
         #now verify the server is really an IPA server
         try:
-            logging.debug("Init ldap with: ldap://"+format_netloc(thost, 389))
+            root_logger.debug("Init ldap with: ldap://"+format_netloc(thost, 389))
             lh = ldap.initialize("ldap://"+format_netloc(thost, 389))
             ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, True)
             ldap.set_option(ldap.OPT_X_TLS_CACERTFILE, "%s/ca.crt" % temp_ca_dir)
@@ -238,7 +238,7 @@ class IPADiscovery:
             lh.simple_bind_s("","")
 
             # get IPA base DN
-            logging.debug("Search LDAP server for IPA base DN")
+            root_logger.debug("Search LDAP server for IPA base DN")
             basedn = get_ipa_basedn(lh)
 
             if basedn is None:
@@ -247,12 +247,12 @@ class IPADiscovery:
             self.basedn = basedn
 
             #search and return known realms
-            logging.debug("Search for (objectClass=krbRealmContainer) in "+self.basedn+"(sub)")
+            root_logger.debug("Search for (objectClass=krbRealmContainer) in "+self.basedn+"(sub)")
             lret = lh.search_s("cn=kerberos,"+self.basedn, ldap.SCOPE_SUBTREE, "(objectClass=krbRealmContainer)")
             if not lret:
                 #something very wrong
                 return [REALM_NOT_FOUND]
-            logging.debug("Found: "+str(lret))
+            root_logger.debug("Found: "+str(lret))
 
             for lres in lret:
                 for lattr in lres[1]:
@@ -278,14 +278,14 @@ class IPADiscovery:
 
         except LDAPError, err:
             if isinstance(err, ldap.TIMEOUT):
-                logging.error("LDAP Error: timeout")
+                root_logger.error("LDAP Error: timeout")
                 return [NO_LDAP_SERVER]
 
             if isinstance(err, ldap.INAPPROPRIATE_AUTH):
-                logging.debug("LDAP Error: Anonymous acces not allowed")
+                root_logger.debug("LDAP Error: Anonymous acces not allowed")
                 return [NO_ACCESS_TO_LDAP]
 
-            logging.error("LDAP Error: %s: %s" %
+            root_logger.error("LDAP Error: %s: %s" %
                (err.args[0]['desc'], err.args[0].get('info', '')))
             return [UNKNOWN_ERROR]
 
@@ -372,6 +372,6 @@ class IPADiscovery:
                         kdc = qname
 
             if not kdc:
-                logging.debug("SRV record for KDC not found! Realm: %s, SRV record: %s" % (realm, qname))
+                root_logger.debug("SRV record for KDC not found! Realm: %s, SRV record: %s" % (realm, qname))
 
         return [realm, kdc]