From 64615a35835f77f2d34ed76f5780820a397d368e Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Fri, 22 Jul 2016 12:31:17 +0200 Subject: [PATCH 1/2] load the config file from environment --- rida.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rida.py b/rida.py index b05a8c77..0340d67e 100755 --- a/rida.py +++ b/rida.py @@ -33,7 +33,7 @@ from flask import Flask, request import json import logging import modulemd -import os.path +import os import rida.auth import rida.config import rida.database @@ -46,8 +46,10 @@ import tempfile app = Flask(__name__) app.config.from_envvar("RIDA_SETTINGS", silent=True) -# TODO: Load the config file from environment -conf = rida.config.from_file("rida.conf") +if os.environ.get('RIDA_CONFIG') and os.path.isfile(os.environ.get('RIDA_CONFIG')): + conf = rida.config.from_file(os.environ.get('RIDA_CONFIG')) +else: + conf = rida.config.from_file("rida.conf") rida.logger.init_logging(conf) db = rida.database.Database(conf) From e668233bb4649211a9eb40a7225a7648e07d353d Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Fri, 22 Jul 2016 12:58:25 +0200 Subject: [PATCH 2/2] simplify RIDA_CONFIG handling --- rida.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rida.py b/rida.py index 0340d67e..f1c8c4c0 100755 --- a/rida.py +++ b/rida.py @@ -46,8 +46,9 @@ import tempfile app = Flask(__name__) app.config.from_envvar("RIDA_SETTINGS", silent=True) -if os.environ.get('RIDA_CONFIG') and os.path.isfile(os.environ.get('RIDA_CONFIG')): - conf = rida.config.from_file(os.environ.get('RIDA_CONFIG')) +ridaconfig=os.environ.get('RIDA_CONFIG') +if ridaconfig: + conf = rida.config.from_file(ridaconfig) else: conf = rida.config.from_file("rida.conf") rida.logger.init_logging(conf)