Merge pull request #4855 from matrix-org/rav/refactor_transaction_queue

Split TransactionQueue up
This commit is contained in:
Richard van der Hoff 2019-03-15 12:32:11 +00:00 committed by GitHub
commit 3b7ceb2c69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 865 additions and 761 deletions

View file

@ -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: