From c02d6db6a34e3a135b2a00e6c6bebd0507ec4d56 Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Tue, 30 Nov 2010 15:46:24 -0200 Subject: [PATCH] scrapyd: force application to receive config as argument --- scrapyd/__init__.py | 7 ++++--- scrapyd/app.py | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scrapyd/__init__.py b/scrapyd/__init__.py index 020997f5e..0b1a77adb 100644 --- a/scrapyd/__init__.py +++ b/scrapyd/__init__.py @@ -1,8 +1,9 @@ from scrapy.utils.misc import load_object from .config import Config -def get_application(): - config = Config() +def get_application(config=None): + if config is None: + config = Config() apppath = config.get('application', 'scrapyd.app.application') appfunc = load_object(apppath) - return appfunc() + return appfunc(config) diff --git a/scrapyd/app.py b/scrapyd/app.py index 2ce777c1a..0cf573df5 100644 --- a/scrapyd/app.py +++ b/scrapyd/app.py @@ -11,9 +11,8 @@ from .environ import Environment from .website import Root from .config import Config -def application(): +def application(config): app = Application("Scrapyd") - config = Config() http_port = config.getint('http_port', 6800) poller = QueuePoller(config)