diff options
author | Dylan Garrett <dylan.garrett@gmail.com> | 2021-06-09 22:27:21 -0700 |
---|---|---|
committer | Dylan Garrett <dylan.garrett@gmail.com> | 2021-06-09 22:27:21 -0700 |
commit | 3a2c067bd6790f9c10d7cf3f82cee7aa46777681 (patch) | |
tree | 2f19c3c152194fad787ae3f3da861a5c9807977e | |
parent | 1ada218538511fa1e1fd982133a928aa589647bb (diff) | |
download | roka-3a2c067bd6790f9c10d7cf3f82cee7aa46777681.tar.gz roka-3a2c067bd6790f9c10d7cf3f82cee7aa46777681.zip |
Always load one or the other config
-rwxr-xr-x | roka.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -114,7 +114,7 @@ if __name__ == '__main__': self.__dict__ = d config = objectview(json.loads(args.config)) app.config.from_object(config) - elif os.path.exists(os.path.join(abs_path, 'app.cfg')): + else: app.config.from_pyfile(os.path.join(abs_path, 'app.cfg')) root_path = os.path.expanduser(app.config['ROOT_PATH']) |