From 3b0391b8f2c5fac43e658f5dbaf835e5bedb10f0 Mon Sep 17 00:00:00 2001 From: Mikhail Korobov Date: Sat, 6 Jun 2015 02:49:39 +0500 Subject: [PATCH] CrawlerProcess cleanup * remove unneeded lambda; * extract _get_dns_resolver method and format code to pep8. (cherry picked from commit 33d145e2f5a1f470398d96184b4da158e3ef7240) --- scrapy/crawler.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/scrapy/crawler.py b/scrapy/crawler.py index 3e18182c0..2d0cd2ebc 100644 --- a/scrapy/crawler.py +++ b/scrapy/crawler.py @@ -242,16 +242,25 @@ class CrawlerProcess(CrawlerRunner): # Don't start the reactor if the deferreds are already fired if d.called: return - d.addBoth(lambda _: self._stop_reactor()) + d.addBoth(self._stop_reactor) - cache_size = self.settings.getint('DNSCACHE_SIZE') if self.settings.getbool('DNSCACHE_ENABLED') else 0 - reactor.installResolver(CachingThreadedResolver(reactor, cache_size, - self.settings.getfloat('DNS_TIMEOUT'))) + reactor.installResolver(self._get_dns_resolver()) tp = reactor.getThreadPool() tp.adjustPoolsize(maxthreads=self.settings.getint('REACTOR_THREADPOOL_MAXSIZE')) reactor.addSystemEventTrigger('before', 'shutdown', self.stop) reactor.run(installSignalHandlers=False) # blocking call + def _get_dns_resolver(self): + if self.settings.getbool('DNSCACHE_ENABLED'): + cache_size = self.settings.getint('DNSCACHE_SIZE') + else: + cache_size = 0 + return CachingThreadedResolver( + reactor=reactor, + cache_size=cache_size, + timeout=self.settings.getfloat('DNS_TIMEOUT') + ) + def _stop_reactor(self, _=None): try: reactor.stop()