From 19ea0de76623faefe161f093252a14ff8e31002b Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Tue, 19 Jan 2016 15:01:45 +0000 Subject: [PATCH] Reorderd to override from env over credstash over config --- app/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 8b92019d4..c2c557a8a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -75,15 +75,16 @@ def init_csrf(application): def init_app(app, config_overrides): - for key, value in app.config.items(): - if key in os.environ: - app.config[key] = convert_to_boolean(os.environ[key]) if config_overrides: for key in app.config.keys(): if key in config_overrides: app.config[key] = config_overrides[key] + for key, value in app.config.items(): + if key in os.environ: + app.config[key] = convert_to_boolean(os.environ[key]) + @app.context_processor def inject_global_template_variables(): return {'asset_path': '/static/'}