summaryrefslogtreecommitdiffstats
path: root/ipapython
diff options
context:
space:
mode:
authorTomas Krizek <tkrizek@redhat.com>2017-07-18 16:07:12 +0200
committerMartin Babinsky <mbabinsk@redhat.com>2017-07-26 15:57:56 +0200
commitba5f7afedca282e79fdfde0dd359028fc4111f90 (patch)
treed11b9052b0fc98387e96e4075751c6aa96c57840 /ipapython
parent0b8d46019172e83bdbacf7200759de640c19a2d4 (diff)
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 <tkrizek@redhat.com> Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipapython')
-rw-r--r--ipapython/ipa_log_manager.py18
1 files changed, 18 insertions, 0 deletions
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__]