From a21fa84337356aeba294e00bbf63d19552d65553 Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Wed, 4 Oct 2017 13:36:59 +0800 Subject: configs: Use lower case for logging levels --- fg21sim/configs/00-general.conf.spec | 12 ++++++------ fg21sim/configs/manager.py | 10 ++-------- 2 files changed, 8 insertions(+), 14 deletions(-) (limited to 'fg21sim/configs') diff --git a/fg21sim/configs/00-general.conf.spec b/fg21sim/configs/00-general.conf.spec index fd75450..8e4ac59 100644 --- a/fg21sim/configs/00-general.conf.spec +++ b/fg21sim/configs/00-general.conf.spec @@ -122,17 +122,17 @@ ns = float(default=0.96, min=0.0) # Configurations for initialization/reconfiguration of the `logging` module [logging] -# DEBUG: Detailed information, typically of interest only when diagnosing +# debug: Detailed information, typically of interest only when diagnosing # problems. -# INFO: Confirmation that things are working as expected. -# WARNING: An dinciation that something unexpected happended, or indicative +# info: Confirmation that things are working as expected. +# warning: An dinciation that something unexpected happended, or indicative # of some problem in the near future (e.g., "disk space low"). # The software is still working as expected. -# ERROR: Due to a more serious problem, the software has not been able to +# error: Due to a more serious problem, the software has not been able to # perform some function. -# CRITICAL: A serious error, indicating that the program itself may be unable +# critical: A serious error, indicating that the program itself may be unable # to continue running. -level = option("DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL", default="INFO") +level = option("debug", "info", "warning", "error", "critical", default="info") # Set the format of displayed messages format = string(default="%(asctime)s [%(levelname)s] <%(name)s> %(message)s") diff --git a/fg21sim/configs/manager.py b/fg21sim/configs/manager.py index bfadab0..bbeabf7 100644 --- a/fg21sim/configs/manager.py +++ b/fg21sim/configs/manager.py @@ -519,15 +519,9 @@ class ConfigManager: """ Get and prepare the logging configurations for ``logging.basicConfig()`` to initialize the logging module. - - NOTE - ---- - ``basicConfig()`` will automatically create a ``Formatter`` with the - giving ``format`` and ``datefmt`` for each handlers if necessary, - and then adding the handlers to the "root" logger. """ conf = self.get("logging") - level = conf["level"] + level = conf["level"].upper() if os.environ.get("DEBUG_FG21SIM"): print("DEBUG: Force 'DEBUG' logging level", file=sys.stderr) level = "DEBUG" @@ -542,7 +536,7 @@ class ConfigManager: if logfile: handlers.append(FileHandler(logfile, mode=filemode)) - # Explicitly add formatter to each handler + # Explicitly add the formatter to each handler formatter = logging.Formatter(fmt=conf["format"], datefmt=conf["datefmt"]) for handler in handlers: -- cgit v1.2.2