RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2894 from redapple/log-custom-overriden-settings 

Move logging of overriden settings to Crawler init
This commit is contained in:
Mikhail Korobov 2017-08-29 19:20:46 +05:00 committed by GitHub
parent a429d78019 1968a8ec02
commit 65ac0b06df
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scrapy/crawler.py
View File

@ -11,7 +11,7 @@ from scrapy.core.engine import ExecutionEngine
from scrapy.resolver import CachingThreadedResolver from scrapy.resolver import CachingThreadedResolver
from scrapy.interfaces import ISpiderLoader from scrapy.interfaces import ISpiderLoader
from scrapy.extension import ExtensionManager from scrapy.extension import ExtensionManager
from scrapy.settings import Settings from scrapy.settings import overridden_settings, Settings
from scrapy.signalmanager import SignalManager from scrapy.signalmanager import SignalManager
from scrapy.exceptions import ScrapyDeprecationWarning from scrapy.exceptions import ScrapyDeprecationWarning
from scrapy.utils.ossignal import install_shutdown_handlers, signal_names from scrapy.utils.ossignal import install_shutdown_handlers, signal_names
@ -34,6 +34,9 @@ class Crawler(object):
self.settings = settings.copy() self.settings = settings.copy()
self.spidercls.update_settings(self.settings) self.spidercls.update_settings(self.settings)
d = dict(overridden_settings(self.settings))
logger.info("Overridden settings: %(settings)r", {'settings': d})
self.signals = SignalManager(self) self.signals = SignalManager(self)
self.stats = load_object(self.settings['STATS_CLASS'])(self) self.stats = load_object(self.settings['STATS_CLASS'])(self)

4
scrapy/utils/log.py
View File

@ -9,7 +9,7 @@ from twisted.python.failure import Failure
from twisted.python import log as twisted_log from twisted.python import log as twisted_log
import scrapy import scrapy
from scrapy.settings import overridden_settings, Settings from scrapy.settings import Settings
from scrapy.exceptions import ScrapyDeprecationWarning from scrapy.exceptions import ScrapyDeprecationWarning
from scrapy.utils.versions import scrapy_components_versions from scrapy.utils.versions import scrapy_components_versions
@ -148,8 +148,6 @@ def log_scrapy_info(settings):
{'versions': ", ".join("%s %s" % (name, version) {'versions': ", ".join("%s %s" % (name, version)
for name, version in scrapy_components_versions() for name, version in scrapy_components_versions()
if name != "Scrapy")}) if name != "Scrapy")})
d = dict(overridden_settings(settings))
logger.info("Overridden settings: %(settings)r", {'settings': d})
class StreamLogger(object): class StreamLogger(object):