Merge pull request #2979 from matrix-org/erikj/no_handlers

Don't build handlers on workers unnecessarily

1 files changed, 9 insertions, 4 deletions

diff --git a/synapse/server.py b/synapse/server.py
index 1bc8d6f702..894e9c2acf 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -32,7 +32,8 @@ from synapse.appservice.scheduler import ApplicationServiceScheduler
 from synapse.crypto.keyring import Keyring
 from synapse.events.builder import EventBuilderFactory
 from synapse.events.spamcheck import SpamChecker
-from synapse.federation import initialize_http_replication
+from synapse.federation.federation_client import FederationClient
+from synapse.federation.federation_server import FederationServer
 from synapse.federation.send_queue import FederationRemoteSendQueue
 from synapse.federation.federation_server import FederationHandlerRegistry
 from synapse.federation.transport.client import TransportLayerClient
@@ -100,7 +101,8 @@ class HomeServer(object):
     DEPENDENCIES = [
         'http_client',
         'db_pool',
-        'replication_layer',
+        'replication_client',
+        'replication_server',
         'handlers',
         'v1auth',
         'auth',
@@ -197,8 +199,11 @@ class HomeServer(object):
     def get_ratelimiter(self):
         return self.ratelimiter
 
-    def build_replication_layer(self):
-        return initialize_http_replication(self)
+    def build_replication_client(self):
+        return FederationClient(self)
+
+    def build_replication_server(self):
+        return FederationServer(self)
 
     def build_handlers(self):
         return Handlers(self)