IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

logging: make sure logging level is set to proper value

Browse Source 
During py.test initialization, the value 'debug' is passed instead
of logging.DEBUG.

Signed-off-by: Tomas Krizek <tkrizek@redhat.com>
Reviewed-By: David Kupka <dkupka@redhat.com>
This commit is contained in:
Tomas Krizek 2017-07-18 16:07:12 +02:00 committed by Martin Babinsky
parent 0b8d460191
commit ba5f7afedc
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ipalib/plugable.py
View File

@ -461,21 +461,7 @@ class API(ReadOnly):
if not match:
continue
value = match.group(1)
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]
except KeyError:
raise ValueError('unknown log level (%s)' % value)
level = ipa_log_manager.convert_log_level(match.group(1))
value = getattr(self.env, attr)
regexps = re.split('\s*,\s*', value)

18
ipapython/ipa_log_manager.py
View File

@ -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__]

6
ipatests/pytest_plugins/nose_compat.py
View File

@ -23,7 +23,7 @@ import os
import sys
import logging
from ipapython.ipa_log_manager import Formatter
from ipapython.ipa_log_manager import Formatter, convert_log_level
def pytest_addoption(parser):
@ -61,8 +61,10 @@ def pytest_configure(config):
capture._capturing.resume_capturing()
sys.stdout, sys.stderr = orig_stdout, orig_stderr
level = convert_log_level(config.getoption('logging_level'))
handler = LogHandler()
handler.setFormatter(Formatter('[%(name)s] %(message)s'))
handler.setLevel(config.getoption('logging_level'))
handler.setLevel(level)
root_logger = logging.getLogger()
root_logger.addHandler(handler)