diff options
author | John Dennis <jdennis@redhat.com> | 2011-11-15 14:39:31 -0500 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2011-11-23 09:36:18 +0100 |
commit | 56401c1abe7d4c78650acfcd9bbe8c8edc1dac57 (patch) | |
tree | a759f9fb51d4e2e110c55dbecc45f436386ee30f /install/tools/ipa-ca-install | |
parent | 730f1228a91ec9c6e575181807da2ab994a38071 (diff) | |
download | freeipa-56401c1abe7d4c78650acfcd9bbe8c8edc1dac57.tar.gz freeipa-56401c1abe7d4c78650acfcd9bbe8c8edc1dac57.tar.xz freeipa-56401c1abe7d4c78650acfcd9bbe8c8edc1dac57.zip |
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()
Diffstat (limited to 'install/tools/ipa-ca-install')
-rwxr-xr-x | install/tools/ipa-ca-install | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install index 445b06214..57f867e70 100755 --- a/install/tools/ipa-ca-install +++ b/install/tools/ipa-ca-install @@ -21,7 +21,7 @@ import sys import socket -import os, traceback, logging, shutil +import os, traceback, shutil from ipapython import ipautil from ipapython import services as ipaservices @@ -37,6 +37,7 @@ from ipapython import version from ipalib import api, util from ipapython.config import IPAOptionParser from ipapython import sysrestore +from ipapython.ipa_log_manager import * CACERT="/etc/ipa/ca.crt" REPLICA_INFO_TOP_DIR=None @@ -71,8 +72,8 @@ def get_dirman_password(): def main(): safe_options, options, filename = parse_options() - installutils.standard_logging_setup("/var/log/ipareplica-ca-install.log", options.debug) - logging.debug('%s was invoked with argument "%s" and options: %s' % (sys.argv[0], filename, safe_options)) + standard_logging_setup("/var/log/ipareplica-ca-install.log", debug=options.debug) + root_logger.debug('%s was invoked with argument "%s" and options: %s' % (sys.argv[0], filename, safe_options)) if not ipautil.file_exists(filename): sys.exit("Replica file %s does not exist" % filename) @@ -120,7 +121,7 @@ def main(): try: host = get_host_name(options.no_host_dns) except BadHostError, e: - logging.error(str(e)) + root_logger.error(str(e)) sys.exit(1) if config.host_name != host: try: @@ -170,7 +171,7 @@ except Exception, e: message = str(e) for str in traceback.format_tb(sys.exc_info()[2]): message = message + "\n" + str - logging.debug(message) + root_logger.debug(message) except KeyboardInterrupt: print "Installation cancelled." finally: |