diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2016-02-02 03:41:47 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2016-02-02 04:44:07 +0100 |
| commit | 28373d74f8f118e7982c87f52447f7bb8bef7097 (patch) | |
| tree | 1fb63637855924ec87e60f831b17cbbd89e70e9c /accounts/__init__.py | |
| parent | e1f0fca1991fcfd50836e0c8f8f9c0928854e8d1 (diff) | |
| download | web-28373d74f8f118e7982c87f52447f7bb8bef7097.tar.gz web-28373d74f8f118e7982c87f52447f7bb8bef7097.tar.bz2 web-28373d74f8f118e7982c87f52447f7bb8bef7097.zip | |
Allow to manually load a config file
Diffstat (limited to 'accounts/__init__.py')
| -rw-r--r-- | accounts/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/accounts/__init__.py b/accounts/__init__.py index 08d52ba..80ef29c 100644 --- a/accounts/__init__.py +++ b/accounts/__init__.py @@ -21,15 +21,16 @@ def absolute_paths(app, config): def load_config(app, configfile): if configfile is not None: - filename = os.path.join(app.root_path, configfile) + filename = os.path.abspath(configfile) app.config.from_pyfile(filename) absolute_paths(app, filename) -def create_app(): +def create_app(config=None): app = Flask(__name__) app.config.from_object('accounts.default_settings') load_config(app, os.environ.get('SPLINE_ACCOUNT_WEB_SETTINGS')) + load_config(app, config) app.register_blueprint(default.bp) app.register_blueprint(login.bp) |