jingrow/gunicorn
1
0
Fork 0
mirror of https://github.com/frappe/gunicorn.git synced 2026-01-14 11:09:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

prevent call get_default_config_file if args.config exists

Browse Source
This commit is contained in:
Jorge Niedbalski R 2013-06-22 06:48:01 -07:00
parent cf6e765323
commit c218792fa4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gunicorn/app/base.py
View File

@ -83,12 +83,12 @@ class Application(object):
for k, v in cfg.items(): for k, v in cfg.items():
self.cfg.set(k.lower(), v) self.cfg.set(k.lower(), v)
default_config = get_default_config_file()
if args.config: if args.config:
self.load_config_from_file(args.config) self.load_config_from_file(args.config)
elif default_config is not None: else:
self.load_config_from_file(default_config) default_config = get_default_config_file()
if default_config is not None:
self.load_config_from_file(default_config)
# Lastly, update the configuration with any command line # Lastly, update the configuration with any command line
# settings. # settings.