From 07655d05eaf74fd74a9030fc57f408e69df1fd7c Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Fri, 13 Nov 2009 14:38:22 -0200 Subject: [PATCH] renamed REQUESTS_PER_SPIDER setting to CONCURRENT_REQUESTS_PER_SPIDER --- docs/topics/settings.rst | 6 +++--- scrapy/conf/default_settings.py | 3 +-- scrapy/core/downloader/manager.py | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/topics/settings.rst b/docs/topics/settings.rst index e3591b023..a359ce742 100644 --- a/docs/topics/settings.rst +++ b/docs/topics/settings.rst @@ -725,10 +725,10 @@ A dict containing the request download handlers enabled by default in Scrapy. You should never modify this setting in your project, modify :setting:`REQUEST_HANDLERS` instead. -.. setting:: REQUESTS_PER_SPIDER +.. setting:: CONCURRENT_REQUESTS_PER_SPIDER -REQUESTS_PER_SPIDER -------------------- +CONCURRENT_REQUESTS_PER_SPIDER +------------------------------ Default: ``8`` diff --git a/scrapy/conf/default_settings.py b/scrapy/conf/default_settings.py index 062bf49f9..aadbade34 100644 --- a/scrapy/conf/default_settings.py +++ b/scrapy/conf/default_settings.py @@ -25,7 +25,7 @@ COMMANDS_MODULE = '' COMMANDS_SETTINGS_MODULE = '' CONCURRENT_ITEMS = 100 - +CONCURRENT_REQUESTS_PER_SPIDER = 8 CONCURRENT_SPIDERS = 8 COOKIES_DEBUG = False @@ -136,7 +136,6 @@ REQUEST_HANDLERS_BASE = { } REQUESTS_QUEUE_SIZE = 0 -REQUESTS_PER_SPIDER = 8 # max simultaneous requests per domain # contrib.middleware.retry.RetryMiddleware default settings RETRY_TIMES = 2 # initial response + 2 retries = 3 requests diff --git a/scrapy/core/downloader/manager.py b/scrapy/core/downloader/manager.py index 16ca38be0..5498cc451 100644 --- a/scrapy/core/downloader/manager.py +++ b/scrapy/core/downloader/manager.py @@ -27,7 +27,7 @@ class SiteInfo(object): if download_delay: self.max_concurrent_requests = 1 elif max_concurrent_requests is None: - self.max_concurrent_requests = settings.getint('REQUESTS_PER_SPIDER') + self.max_concurrent_requests = settings.getint('CONCURRENT_REQUESTS_PER_SPIDER') else: self.max_concurrent_requests = max_concurrent_requests