From 4935bee70b4a6b08ea98d03210065c0ce74cdc0e Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Fri, 3 Apr 2020 22:17:05 +0200 Subject: Simplify loading of the configuration file. --- newspipe/bootstrap.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/newspipe/bootstrap.py b/newspipe/bootstrap.py index 2e084a55..70512493 100644 --- a/newspipe/bootstrap.py +++ b/newspipe/bootstrap.py @@ -48,13 +48,14 @@ def set_logging( # Create Flask application application = Flask(__name__, instance_relative_config=True) -if os.environ.get("Newspipe_TESTING", False) == "true": +configuration = os.environ.get("Newspipe_CONFIG", False) +if configuration == "testing": application.debug = logging.DEBUG application.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///:memory:" application.config["TESTING"] = True -elif os.environ.get("Newspipe_CONFIG", False): +elif configuration: # if the configuration file is specified via an environment variable - application.config.from_pyfile(os.environ.get("Newspipe_CONFIG"), silent=False) + application.config.from_pyfile(configuration, silent=False) else: try: application.config.from_pyfile("development.py", silent=False) -- cgit