From 940983966894225e26e8d2e9f8771a845e75e403 Mon Sep 17 00:00:00 2001 From: benoitc Date: Thu, 22 Apr 2010 21:45:39 +0200 Subject: [PATCH] fix paster usage --- gunicorn/config.py | 2 +- gunicorn/main.py | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gunicorn/config.py b/gunicorn/config.py index 26febd4b..d17112f6 100644 --- a/gunicorn/config.py +++ b/gunicorn/config.py @@ -84,7 +84,7 @@ class Config(object): @property 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) if hasattr(worker_class, "setup"): worker_class.setup() diff --git a/gunicorn/main.py b/gunicorn/main.py index ebf0ab6f..bf6fb445 100644 --- a/gunicorn/main.py +++ b/gunicorn/main.py @@ -169,6 +169,7 @@ def run_paster(): pkg_resources.working_set.add_entry(relpath) ctx = loadwsgi.loadcontext(loadwsgi.SERVER, cfgurl, relative_to=relpath) + if not opts.workers: opts.workers = ctx.local_conf.get('workers', 1) @@ -191,9 +192,14 @@ def run_paster(): bind = host opts.bind = bind + for k, v in ctx.local_conf.items(): + if not hasattr(opts, k): + setattr(opts, k, v) + if not opts.debug: opts.debug = (ctx.global_conf.get('debug') == "true") + opts.default_proc_name= ctx.global_conf.get('__file__') 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") opts[key] = value opts['default_proc_name'] = opts['__file__'] - + cfg = Config(opts) + if cfg.spew: spew() if cfg.daemon: @@ -236,7 +243,6 @@ def paste_server(app, gcfg=None, host="127.0.0.1", port=None, *args, **kwargs): else: os.setpgrp() configure_logging(cfg) - Arbiter(cfg, app).run() def daemonize():