summary refs log tree commit diff
path: root/synapse/http/federation/matrix_federation_agent.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-23 17:26:31 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-23 17:26:31 +0100
commit7fffd3789b0cf50917d6d4e01b48d3bdb255574b (patch)
treef41cf82c6b68d631792f7847fca7945e0d47e3a6 /synapse/http/federation/matrix_federation_agent.py
parentMerge commit '15c788e22' into anoa/dinsic_release_1_31_0 (diff)
parentPrevent the config-lint script erroring out on any sample_config changes (#9562) (diff)
downloadsynapse-7fffd3789b0cf50917d6d4e01b48d3bdb255574b.tar.xz
Merge commit '22db45bd4' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'synapse/http/federation/matrix_federation_agent.py')
-rw-r--r--synapse/http/federation/matrix_federation_agent.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/http/federation/matrix_federation_agent.py b/synapse/http/federation/matrix_federation_agent.py

index b07aa59c08..5935a125fd 100644 --- a/synapse/http/federation/matrix_federation_agent.py +++ b/synapse/http/federation/matrix_federation_agent.py
@@ -35,6 +35,7 @@ from synapse.http.client import BlacklistingAgentWrapper from synapse.http.federation.srv_resolver import Server, SrvResolver from synapse.http.federation.well_known_resolver import WellKnownResolver from synapse.logging.context import make_deferred_yieldable, run_in_background +from synapse.types import ISynapseReactor from synapse.util import Clock logger = logging.getLogger(__name__) @@ -68,7 +69,7 @@ class MatrixFederationAgent: def __init__( self, - reactor: IReactorCore, + reactor: ISynapseReactor, tls_client_options_factory: Optional[FederationPolicyForHTTPS], user_agent: bytes, ip_blacklist: IPSet,