summary refs log tree commit diff
path: root/synapse/logging
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-03-04 10:23:26 +0000
committerErik Johnston <erik@matrix.org>2021-03-04 10:23:26 +0000
commit61a970e25fc5e6dc1036b1bb4702ef8e6e44f419 (patch)
tree16fd89ce0b5b0efa51d29c61723401ee6429beb6 /synapse/logging
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parent 1.29.0rc1 (diff)
downloadsynapse-61a970e25fc5e6dc1036b1bb4702ef8e6e44f419.tar.xz
Merge remote-tracking branch 'origin/release-v1.29.0' into matrix-org-hotfixes
Diffstat (limited to 'synapse/logging')
-rw-r--r--synapse/logging/_remote.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/logging/_remote.py b/synapse/logging/_remote.py

index f8e9112b56..174ca7be5a 100644 --- a/synapse/logging/_remote.py +++ b/synapse/logging/_remote.py
@@ -32,7 +32,7 @@ from twisted.internet.endpoints import ( TCP4ClientEndpoint, TCP6ClientEndpoint, ) -from twisted.internet.interfaces import IPushProducer, ITransport +from twisted.internet.interfaces import IPushProducer, IStreamClientEndpoint, ITransport from twisted.internet.protocol import Factory, Protocol from twisted.python.failure import Failure @@ -121,7 +121,9 @@ class RemoteHandler(logging.Handler): try: ip = ip_address(self.host) if isinstance(ip, IPv4Address): - endpoint = TCP4ClientEndpoint(_reactor, self.host, self.port) + endpoint = TCP4ClientEndpoint( + _reactor, self.host, self.port + ) # type: IStreamClientEndpoint elif isinstance(ip, IPv6Address): endpoint = TCP6ClientEndpoint(_reactor, self.host, self.port) else: