|
@@ -13,7 +13,7 @@
|
|
|
# See the License for the specific language governing permissions and
|
|
|
# limitations under the License.
|
|
|
from twisted.internet.endpoints import HostnameEndpoint, wrapClientTLS
|
|
|
-from twisted.internet import defer, reactor
|
|
|
+from twisted.internet import defer
|
|
|
from twisted.internet.error import ConnectError
|
|
|
from twisted.names import client, dns
|
|
|
from twisted.names.error import DNSNameError, DomainError
|
|
@@ -78,17 +78,18 @@ def matrix_federation_endpoint(reactor, destination, ssl_context_factory=None,
|
|
|
else:
|
|
|
return _WrappingEndpointFac(transport_endpoint(
|
|
|
reactor, domain, port, **endpoint_kw_args
|
|
|
- ))
|
|
|
+ ), reactor)
|
|
|
|
|
|
|
|
|
class _WrappingEndpointFac(object):
|
|
|
- def __init__(self, endpoint_fac):
|
|
|
+ def __init__(self, endpoint_fac, reactor):
|
|
|
self.endpoint_fac = endpoint_fac
|
|
|
+ self.reactor = reactor
|
|
|
|
|
|
@defer.inlineCallbacks
|
|
|
def connect(self, protocolFactory):
|
|
|
conn = yield self.endpoint_fac.connect(protocolFactory)
|
|
|
- conn = _WrappedConnection(conn)
|
|
|
+ conn = _WrappedConnection(conn, self.reactor)
|
|
|
defer.returnValue(conn)
|
|
|
|
|
|
|
|
@@ -98,9 +99,10 @@ class _WrappedConnection(object):
|
|
|
"""
|
|
|
__slots__ = ["conn", "last_request"]
|
|
|
|
|
|
- def __init__(self, conn):
|
|
|
+ def __init__(self, conn, reactor):
|
|
|
object.__setattr__(self, "conn", conn)
|
|
|
object.__setattr__(self, "last_request", time.time())
|
|
|
+ self._reactor = reactor
|
|
|
|
|
|
def __getattr__(self, name):
|
|
|
return getattr(self.conn, name)
|
|
@@ -131,14 +133,14 @@ class _WrappedConnection(object):
|
|
|
# Time this connection out if we haven't send a request in the last
|
|
|
# N minutes
|
|
|
# TODO: Cancel the previous callLater?
|
|
|
- reactor.callLater(3 * 60, self._time_things_out_maybe)
|
|
|
+ self._reactor.callLater(3 * 60, self._time_things_out_maybe)
|
|
|
|
|
|
d = self.conn.request(request)
|
|
|
|
|
|
def update_request_time(res):
|
|
|
self.last_request = time.time()
|
|
|
# TODO: Cancel the previous callLater?
|
|
|
- reactor.callLater(3 * 60, self._time_things_out_maybe)
|
|
|
+ self._reactor.callLater(3 * 60, self._time_things_out_maybe)
|
|
|
return res
|
|
|
|
|
|
d.addCallback(update_request_time)
|