Revize 5678036c

Re #8880 - Edited config file (inserted RootDir)
- improved creating of logs and db directories

src/config/configuration.py

@@ -2 +2 @@
 
 import configparser
 import logging
-from logging import handlers
 
-from injector import singleton, inject
+from injector import singleton
 
-from src.constants import DEFAULT_CONNECTION_STRING, TEST_DATABASE_FILE, DEFAULT_SERVER_BASE_URL, LOG_NAME, \
-    LOG_DIR, DEFAULT_LOG_LEVEL, LOG_FILENAME
-from src.constants import LOG_FILE_LOCATION, LOG_FORMAT
-from src.utils.logger import Logger
+from src.constants import DEFAULT_CONNECTION_STRING, TEST_DATABASE_FILE, DEFAULT_SERVER_BASE_URL, \
+    DEFAULT_LOG_LEVEL, DEFAULT_ROOT_DIR
 
 DATABASE_SECTION = "Database"
 DATABASE_CONNECTION_STRING = "ConnectionString"
@@ -17 +14 @@
 SERVER_SECTION = "Server"
 SERVER_BASE_URL = "ServerBaseURL"
 SERVER_LOG_LEVEL = "LogLevel"
+SERVER_ROOT_DIR = "RootDir"
 
 LOG_LEVEL_MAPPING = {
     "DEBUG": logging.DEBUG,
@@ -42 +40 @@
         self.connection_string = DEFAULT_CONNECTION_STRING
         self.base_server_url = DEFAULT_SERVER_BASE_URL
         self.log_level = DEFAULT_LOG_LEVEL
+        self.root_dir = DEFAULT_ROOT_DIR
 
 
 def test_configuration():
@@ -79 +78 @@
             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)
+            app_configuration.root_dir = server_config.get(SERVER_ROOT_DIR, DEFAULT_ROOT_DIR)
 
     binder.bind(Configuration, to=app_configuration, scope=singleton)
-
-
-def configure_logging(config: Configuration):
-    if not os.path.exists(LOG_DIR):
-        os.makedirs(LOG_DIR)
-
-    handler = logging.handlers.TimedRotatingFileHandler(
-        os.path.join(LOG_DIR, LOG_FILENAME),
-        when='H', interval=1)
-    formatter = logging.Formatter(LOG_FORMAT)
-    handler.setFormatter(formatter)
-
-    # set log level based on config file
-    app_logger = logging.getLogger(LOG_NAME)
-    app_logger.setLevel(LOG_LEVEL_MAPPING.get(config.log_level, logging.DEBUG))
-
-    app_logger.addHandler(handler)
-
-    # TODO check is 'valid'
-    log = logging.getLogger('werkzeug')
-    log.disabled = True