open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

suppress misleading DNSLookupError on cancelled connections

Browse Source 
This should be removed after Twisted's ticket
https://twistedmatrix.com/trac/ticket/9696 is fixed (and we increase our
dependency to require a version with the fix).

refs #347
This commit is contained in:
Brian Warner 2019-08-11 21:23:18 -07:00
parent 49c36b0277
commit a489f5da2b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wormhole/_dilation/connector.py
View File

@ -10,7 +10,7 @@ from twisted.internet.defer import DeferredList, CancelledError
from twisted.internet.endpoints import serverFromString from twisted.internet.endpoints import serverFromString
from twisted.internet.protocol import ClientFactory, ServerFactory from twisted.internet.protocol import ClientFactory, ServerFactory
from twisted.internet.address import HostnameAddress, IPv4Address, IPv6Address from twisted.internet.address import HostnameAddress, IPv4Address, IPv6Address
from twisted.internet.error import ConnectingCancelledError from twisted.internet.error import ConnectingCancelledError, DNSLookupError
from twisted.python import log from twisted.python import log
from .. import ipaddrs # TODO: move into _dilation/ from .. import ipaddrs # TODO: move into _dilation/
from .._interfaces import IDilationConnector, IDilationManager from .._interfaces import IDilationConnector, IDilationManager
@ -313,6 +313,10 @@ class Connector(object):
self._connect, ep, desc, is_relay) self._connect, ep, desc, is_relay)
d.addErrback(lambda f: f.trap(ConnectingCancelledError, d.addErrback(lambda f: f.trap(ConnectingCancelledError,
CancelledError)) CancelledError))
# TODO: HostnameEndpoint.connect catches CancelledError and replaces
# it with DNSLookupError. Remove this workaround when
# https://twistedmatrix.com/trac/ticket/9696 is fixed.
d.addErrback(lambda f: f.trap(DNSLookupError))
d.addErrback(log.err) d.addErrback(log.err)
self._pending_connectors.add(d) self._pending_connectors.add(d)