From 4b6f0e93769a34d3e18b41558f594adbf4f3b416 Mon Sep 17 00:00:00 2001 From: Keiran Price Date: Fri, 26 Jul 2019 08:37:49 +0100 Subject: [PATCH] #13: Use config class --- common/constants.py | 5 ++++- common/logger_setup.py | 6 +++--- src/main.py | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/common/constants.py b/common/constants.py index 5ac55a36..c831f7e7 100644 --- a/common/constants.py +++ b/common/constants.py @@ -1,2 +1,5 @@ +from common.config import config + + class Constants: - DATABASE_URL = "mysql+pymysql://root:rootpw@localhost:13306/icatdb" + DATABASE_URL = config.get_db_url() diff --git a/common/logger_setup.py b/common/logger_setup.py index 445b96f4..1b7d9548 100644 --- a/common/logger_setup.py +++ b/common/logger_setup.py @@ -1,5 +1,5 @@ import logging.config - +from common.config import config log_level = "DEBUG" LOG_FILE_NAME = "../logs.log" @@ -9,7 +9,7 @@ "format": "[%(asctime)s] {%(module)s:%(filename)s:%(funcName)s:%(lineno)d} %(levelname)s -%(message)s ", }}, "handlers": {"default": { - "level": "DEBUG", + "level": config.get_log_level(), "formatter": "default", "class": "logging.handlers.RotatingFileHandler", "filename": LOG_FILE_NAME, @@ -17,7 +17,7 @@ "backupCount": 10 }}, "root": { - "level": log_level, + "level": config.get_log_level(), "handlers": ["default"] } } diff --git a/src/main.py b/src/main.py index c5b1dedd..5ac5d6ac 100644 --- a/src/main.py +++ b/src/main.py @@ -1,6 +1,7 @@ from flask import Flask from flask_restful import Api +from common.config import config from common.logger_setup import setup_logger from src.resources.entities.dataset_type_endpoints import * from src.resources.entities.applications_endpoints import * @@ -200,4 +201,4 @@ if __name__ == "__main__": - app.run(debug=True) \ No newline at end of file + app.run(debug=config.is_debug_mode()) \ No newline at end of file