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

make sur app can override options if needed. While I'm here clean a

Browse Source 
little the code
This commit is contained in:
Benoit Chesneau 2010-02-17 10:59:33 +01:00
parent daeab8655c
commit 85b12af1ca
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gunicorn/main.py
View File

@ -122,24 +122,14 @@ def main(usage, get_app):
version="%prog " + __version__) version="%prog " + __version__)
opts, args = parser.parse_args() opts, args = parser.parse_args()
conf = Config(opts.__dict__)
app = get_app(parser, opts, args) app = get_app(parser, opts, args)
conf = Config(opts.__dict__)
workers = conf['workers'] arbiter = Arbiter(conf.address, conf.workers, app, config=conf,
addr = conf['address'] debug=conf['debug'], pidfile=conf['pidfile'])
kwargs = dict(
config=conf,
debug=conf['debug'],
pidfile=conf['pidfile']
)
arbiter = Arbiter(addr, workers, app, **kwargs)
if conf['daemon']: if conf['daemon']:
daemonize(conf['umask']) daemonize(conf['umask'])
else: else:
os.setpgrp() os.setpgrp()
set_owner_process(conf['user'], conf['group']) set_owner_process(conf['user'], conf['group'])
configure_logging(conf) configure_logging(conf)
arbiter.run() arbiter.run()
@ -168,7 +158,7 @@ def paste_server(app, global_conf=None, host="127.0.0.1", port=None,
conf = Config(options) conf = Config(options)
arbiter = Arbiter(conf.address, conf.workers, app, debug=conf["debug"], arbiter = Arbiter(conf.address, conf.workers, app, debug=conf["debug"],
pidfile=pidfile=conf["pidfile"], config=conf) pidfile=conf["pidfile"], config=conf)
if conf["daemon"] : if conf["daemon"] :
daemonize(conf["umask"]) daemonize(conf["umask"])
else: else:
@ -259,10 +249,8 @@ def run_paster():
ctx = loadwsgi.loadcontext(loadwsgi.SERVER, config_url, ctx = loadwsgi.loadcontext(loadwsgi.SERVER, config_url,
relative_to=relative_to) relative_to=relative_to)
if opts.workers: if not opts.workers:
workers = opts.workers opts.workers = ctx.local_conf.get('workers', 1)
else:
workers = int(ctx.local_conf.get('workers', 1))
if not opts.umask: if not opts.umask:
opts.umask = int(ctx.local_conf.get('umask', UMASK)) opts.umask = int(ctx.local_conf.get('umask', UMASK))
@ -283,12 +271,8 @@ def run_paster():
bind = host bind = host
opts.bind = bind opts.bind = bind
debug = ctx.global_conf.get('debug') == "true" if not opts.debug:
if debug: opts.debug = (ctx.global_conf.get('debug') == "true")
# we force to one worker in debug mode.
workers = 1
opts.workers=workers
app = loadapp(config_url, relative_to=relative_to) app = loadapp(config_url, relative_to=relative_to)
return app return app