diff options
| -rw-r--r-- | src/python/lmi/providers/cmpi_logging.py | 14 | ||||
| -rw-r--r-- | src/software/config/software.conf | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/python/lmi/providers/cmpi_logging.py b/src/python/lmi/providers/cmpi_logging.py index ca24601..4d780df 100644 --- a/src/python/lmi/providers/cmpi_logging.py +++ b/src/python/lmi/providers/cmpi_logging.py @@ -30,9 +30,9 @@ import os import sys # Custom logging levels -TRACE_WARNING = logging.INFO - 1 -TRACE_INFO = logging.INFO - 2 -TRACE_VERBOSE = logging.DEBUG +TRACE_WARNING = logging.DEBUG - 1 +TRACE_INFO = logging.DEBUG - 2 +TRACE_VERBOSE = logging.DEBUG - 3 # Mapping from level name to its number LOGGING_LEVELS = { @@ -41,10 +41,10 @@ LOGGING_LEVELS = { "warning" : logging.WARNING, "warn" : logging.WARNING, "info" : logging.INFO, + "debug" : logging.DEBUG, "trace_warning" : TRACE_WARNING, "trace_info" : TRACE_INFO, - "trace_verbose" : TRACE_VERBOSE, - "debug" : logging.DEBUG + "trace_verbose" : TRACE_VERBOSE } DEFAULT_LOGGING_CONFIG = { @@ -130,11 +130,13 @@ class CMPILogHandler(logging.Handler): self.cmpi_logger.log_warn(msg) elif record.levelno >= logging.INFO: self.cmpi_logger.log_info(msg) + elif record.levelno >= logging.DEBUG: + self.cmpi_logger.log_debug(record.filename, msg) elif record.levelno >= TRACE_WARNING: self.cmpi_logger.trace_warn(record.filename, msg) elif record.levelno >= TRACE_INFO: self.cmpi_logger.trace_info(record.filename, msg) - elif record.levelno >= logging.DEBUG: + elif record.levelno >= TRACE_VERBOSE: self.cmpi_logger.trace_verbose(record.filename, msg) class CMPILogger(logging.getLoggerClass()): diff --git a/src/software/config/software.conf b/src/software/config/software.conf index 0332ecd..91a809d 100644 --- a/src/software/config/software.conf +++ b/src/software/config/software.conf @@ -42,7 +42,7 @@ # by CIMOM. # Level can be set to following values: -# DEBUG, TRACE_INFO, TRACE_WARNING, INFO, WARNING, ERROR, CRITICAL +# TRACE_VERBOSE, TRACE_INFO, TRACE_WARNING, DEBUG, INFO, WARNING, ERROR, CRITICAL # It does not have any effect, if file_config option is set. #Level = ERROR |