Skip to content

Commit

Permalink
isso/init: ISSO_SETTINGS takes precedence over -c
Browse files Browse the repository at this point in the history
This restores the behavior as was documented in the server
config docs, i.e. makes it possible to use
`ISSO_SETTINGS=share/isso-dev.cfg isso run`.
This used to fail as `ISSO_SETTINGS` was only read by WSGI
invocations of `isso.dispatch` or `isso.run`
  • Loading branch information
ix5 committed May 5, 2022
1 parent ee348a1 commit 6680858
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion isso/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,8 @@ def main():

args = parser.parse_args()

conf_file = args.conf
# ISSO_SETTINGS env var takes precedence over `-c` flag
conf_file = os.environ.get('ISSO_SETTINGS') or args.conf

if not conf_file:
logger.error("No configuration file specified! Exiting.")
Expand Down

0 comments on commit 6680858

Please sign in to comment.