summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-03-15 12:32:11 +0000
committerGitHub <noreply@github.com>2019-03-15 12:32:11 +0000
commit3b7ceb2c69085ca1c1690a3b305f931565fca82f (patch)
tree82525a82bd59bd7d73f5566c1433403a63427582 /synapse/server.py
parentMerge pull request #4852 from matrix-org/rav/move_rr_sending_to_worker (diff)
parentchangelog (diff)
downloadsynapse-3b7ceb2c69085ca1c1690a3b305f931565fca82f.tar.xz
Merge pull request #4855 from matrix-org/rav/refactor_transaction_queue
Split TransactionQueue up
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/server.py b/synapse/server.py

index b9549dd042..dc8f1ccb8c 100644 --- a/synapse/server.py +++ b/synapse/server.py
@@ -42,7 +42,7 @@ from synapse.federation.federation_server import ( ReplicationFederationHandlerRegistry, ) from synapse.federation.send_queue import FederationRemoteSendQueue -from synapse.federation.transaction_queue import TransactionQueue +from synapse.federation.sender import FederationSender from synapse.federation.transport.client import TransportLayerClient from synapse.groups.attestations import GroupAttestationSigning, GroupAttestionRenewer from synapse.groups.groups_server import GroupsServerHandler @@ -434,7 +434,7 @@ class HomeServer(object): def build_federation_sender(self): if self.should_send_federation(): - return TransactionQueue(self) + return FederationSender(self) elif not self.config.worker_app: return FederationRemoteSendQueue(self) else: