Revize d78aa613

Re #8707 - Enhanced logging to set log level based on config file

src/config/configuration.py

@@ -4 +4 @@
 import logging
 from logging import handlers
 
-from injector import singleton
+from injector import singleton, inject
 
 from src.constants import DEFAULT_CONNECTION_STRING, TEST_DATABASE_FILE, DEFAULT_SERVER_BASE_URL, LOG_NAME, \
-    LOG_DIR_LOCATION
+    LOG_DIR_LOCATION, DEFAULT_LOG_LEVEL
 from src.constants import LOG_FILE_LOCATION, LOG_FORMAT
 from src.utils.logger import Logger
 
@@ -16 +16 @@
 
 SERVER_SECTION = "Server"
 SERVER_BASE_URL = "ServerBaseURL"
+SERVER_LOG_LEVEL = "LogLevel"
 
 
 class Configuration:
@@ -31 +32 @@
         """
         self.connection_string = DEFAULT_CONNECTION_STRING
         self.base_server_url = DEFAULT_SERVER_BASE_URL
+        self.log_level = DEFAULT_LOG_LEVEL
 
 
 def test_configuration():
@@ -50 +52 @@
     :param binder: injector configuration binder instance
     :return: N/A
     """
-    # TODO check: log which configuration is going to be used
     config_name = "X509_CONFIG"
-    Logger.info(f"Using configuration '{config_name}'")
     config_file = os.environ.get(config_name)
     app_configuration = Configuration()
     # if configuration file is not specified use the default configuration
@@ -68 +68 @@
             server_config = config[SERVER_SECTION]
             app_configuration.base_server_url = server_config.get(SERVER_BASE_URL,
                                                                   DEFAULT_SERVER_BASE_URL)
-
+            app_configuration.log_level = server_config.get(SERVER_LOG_LEVEL, DEFAULT_LOG_LEVEL)
     binder.bind(Configuration, to=app_configuration, scope=singleton)
 
 
-def configure_logging():
+def configure_logging(config: Configuration):
     if not os.path.exists(LOG_DIR_LOCATION.shortest_relative_path()):
         os.makedirs(LOG_DIR_LOCATION.shortest_relative_path())
 
@@ -82 +82 @@
     formatter = logging.Formatter(LOG_FORMAT)
     handler.setFormatter(formatter)
 
+    # set log level based on config file
     app_logger = logging.getLogger(LOG_NAME)
-    app_logger.setLevel(logging.DEBUG)
+    if config.log_level == "DEBUG":
+        app_logger.setLevel(logging.DEBUG)
+    elif config.log_level == "INFO":
+        app_logger.setLevel(logging.INFO)
+    elif config.log_level == "WARNING":
+        app_logger.setLevel(logging.WARNING)
+    elif config.log_level == "ERROR":
+        app_logger.setLevel(logging.ERROR)
+    else:
+        app_logger.setLevel(logging.DEBUG)#
+
     app_logger.addHandler(handler)
 
     # TODO check is 'valid'