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

fix paster usage

Browse Source
This commit is contained in:
benoitc 2010-04-22 21:45:39 +02:00
parent 73ed5f87b7
commit 9409839668
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gunicorn/config.py
View File

@ -84,7 +84,7 @@ class Config(object):
@property @property
def worker_class(self): def worker_class(self):
uri = self.cfg.get('workerclass', None) or 'egg:gunicorn#sync' uri = self.cfg.get('worker_class', None) or 'egg:gunicorn#sync'
worker_class = util.load_worker_class(uri) worker_class = util.load_worker_class(uri)
if hasattr(worker_class, "setup"): if hasattr(worker_class, "setup"):
worker_class.setup() worker_class.setup()

10
gunicorn/main.py
View File

@ -169,6 +169,7 @@ def run_paster():
pkg_resources.working_set.add_entry(relpath) pkg_resources.working_set.add_entry(relpath)
ctx = loadwsgi.loadcontext(loadwsgi.SERVER, cfgurl, relative_to=relpath) ctx = loadwsgi.loadcontext(loadwsgi.SERVER, cfgurl, relative_to=relpath)
if not opts.workers: if not opts.workers:
opts.workers = ctx.local_conf.get('workers', 1) opts.workers = ctx.local_conf.get('workers', 1)
@ -191,9 +192,14 @@ def run_paster():
bind = host bind = host
opts.bind = bind opts.bind = bind
for k, v in ctx.local_conf.items():
if not hasattr(opts, k):
setattr(opts, k, v)
if not opts.debug: if not opts.debug:
opts.debug = (ctx.global_conf.get('debug') == "true") opts.debug = (ctx.global_conf.get('debug') == "true")
opts.default_proc_name= ctx.global_conf.get('__file__') opts.default_proc_name= ctx.global_conf.get('__file__')
app = loadapp(cfgurl, relative_to=relpath) app = loadapp(cfgurl, relative_to=relpath)
@ -227,8 +233,9 @@ def paste_server(app, gcfg=None, host="127.0.0.1", port=None, *args, **kwargs):
value = (value == "true") value = (value == "true")
opts[key] = value opts[key] = value
opts['default_proc_name'] = opts['__file__'] opts['default_proc_name'] = opts['__file__']
cfg = Config(opts) cfg = Config(opts)
if cfg.spew: if cfg.spew:
spew() spew()
if cfg.daemon: if cfg.daemon:
@ -236,7 +243,6 @@ def paste_server(app, gcfg=None, host="127.0.0.1", port=None, *args, **kwargs):
else: else:
os.setpgrp() os.setpgrp()
configure_logging(cfg) configure_logging(cfg)
Arbiter(cfg, app).run() Arbiter(cfg, app).run()
def daemonize(): def daemonize():