summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-04-15 13:58:12 +0100
committerErik Johnston <erik@matrix.org>2021-04-15 14:13:18 +0100
commit9f1a20f0c290914fbb926691e5823de0b7a84102 (patch)
treef8ca2199565bbebfaccedf8198908aecfb58c6e7 /synapse/server.py
parentFix module api (diff)
downloadsynapse-9f1a20f0c290914fbb926691e5823de0b7a84102.tar.xz
Remove the federation replication stream and associated commands
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/synapse/server.py b/synapse/server.py
index 42d2fad8e8..eaeaec9d77 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -59,7 +59,6 @@ from synapse.federation.federation_server import (
     FederationHandlerRegistry,
     FederationServer,
 )
-from synapse.federation.send_queue import FederationRemoteSendQueue
 from synapse.federation.sender import AbstractFederationSender, FederationSender
 from synapse.federation.transport.client import TransportLayerClient
 from synapse.groups.attestations import GroupAttestationSigning, GroupAttestionRenewer
@@ -580,13 +579,11 @@ class HomeServer(metaclass=abc.ABCMeta):
         return TransportLayerClient(self)
 
     @cache_in_self
-    def get_federation_sender(self) -> AbstractFederationSender:
+    def get_federation_sender(self) -> Optional[AbstractFederationSender]:
         if self.should_send_federation():
             return FederationSender(self)
-        elif not self.config.worker_app:
-            return FederationRemoteSendQueue(self)
         else:
-            raise Exception("Workers cannot send federation traffic")
+            return None
 
     @cache_in_self
     def get_receipts_handler(self) -> ReceiptsHandler: