From ba5f7afedca282e79fdfde0dd359028fc4111f90 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Tue, 18 Jul 2017 16:07:12 +0200 Subject: logging: make sure logging level is set to proper value During py.test initialization, the value 'debug' is passed instead of logging.DEBUG. Signed-off-by: Tomas Krizek Reviewed-By: David Kupka --- ipapython/ipa_log_manager.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'ipapython') diff --git a/ipapython/ipa_log_manager.py b/ipapython/ipa_log_manager.py index db38e9498..8b18094bf 100644 --- a/ipapython/ipa_log_manager.py +++ b/ipapython/ipa_log_manager.py @@ -181,6 +181,24 @@ def standard_logging_setup(filename=None, verbose=False, debug=False, root_logger.addHandler(console_handler) +def convert_log_level(value): + try: + level = int(value) + except ValueError: + try: + level = { + 'debug': logging.DEBUG, + 'info': logging.INFO, + 'warn': logging.WARNING, + 'warning': logging.WARNING, + 'error': logging.ERROR, + 'critical': logging.CRITICAL + }[value.lower()] + except KeyError: + raise ValueError('unknown log level (%s)' % value) + return level + + # Single shared instance of log manager log_mgr = sys.modules[__name__] -- cgit