mirror of https://github.com/scrapy/scrapy.git
Remove non-working DNS timeout code
This commit is contained in:
parent
55babf9acd
commit
8c3de288fa
|
|
@ -320,7 +320,6 @@ class CrawlerProcess(CrawlerRunner):
|
|||
return CachingHostnameResolver(
|
||||
resolver=reactor.nameResolver,
|
||||
cache_size=cache_size,
|
||||
timeout=self.settings.getfloat('DNS_TIMEOUT'),
|
||||
)
|
||||
|
||||
def _graceful_stop_reactor(self):
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
from twisted.internet import reactor
|
||||
from twisted.internet.interfaces import IHostnameResolver, IResolutionReceiver
|
||||
from zope.interface.declarations import implementer, provider
|
||||
|
||||
|
|
@ -12,9 +11,8 @@ dnscache = LocalCache(10000)
|
|||
@implementer(IHostnameResolver)
|
||||
class CachingHostnameResolver:
|
||||
|
||||
def __init__(self, resolver, cache_size, timeout):
|
||||
def __init__(self, resolver, cache_size):
|
||||
self.resolver = resolver
|
||||
self.timeout = timeout
|
||||
dnscache.limit = cache_size
|
||||
|
||||
def resolveHostName(self, resolutionReceiver, hostName, portNumber=0,
|
||||
|
|
@ -23,14 +21,10 @@ class CachingHostnameResolver:
|
|||
@provider(IResolutionReceiver)
|
||||
class CachingResolutionReceiver(resolutionReceiver):
|
||||
|
||||
def __init__(self, timeout):
|
||||
self.timeout = timeout
|
||||
self.resolved = False
|
||||
|
||||
def resolutionBegan(self, resolution):
|
||||
super(CachingResolutionReceiver, self).resolutionBegan(resolution)
|
||||
self.resolution = resolution
|
||||
# reactor.callLater(self.timeout, resolution.cancel)
|
||||
self.resolved = False
|
||||
|
||||
def addressResolved(self, address):
|
||||
super(CachingResolutionReceiver, self).addressResolved(address)
|
||||
|
|
@ -45,7 +39,7 @@ class CachingHostnameResolver:
|
|||
result = dnscache[hostName]
|
||||
except KeyError:
|
||||
result = self.resolver.resolveHostName(
|
||||
CachingResolutionReceiver(self.timeout),
|
||||
CachingResolutionReceiver(),
|
||||
hostName,
|
||||
portNumber,
|
||||
addressTypes,
|
||||
|
|
|
|||
Loading…
Reference in New Issue