diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-17 14:15:48 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-17 14:15:48 +0100 |
| commit | 782689bd408b7d291fef913a318e1a6dda6f13e1 (patch) | |
| tree | 50502568cd0b9966e8c42d48d8db5d6cdf73fe1c /synapse/server.py | |
| parent | Split ProfileHandler into master and worker (diff) | |
| parent | Merge pull request #3708 from matrix-org/neilj/resource_Limit_block_event_cre... (diff) | |
| download | synapse-782689bd408b7d291fef913a318e1a6dda6f13e1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_profiles
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/server.py b/synapse/server.py index be85aad8cf..fcfa7e6557 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -36,6 +36,7 @@ from synapse.federation.federation_client import FederationClient from synapse.federation.federation_server import ( FederationHandlerRegistry, FederationServer, + ReplicationFederationHandlerRegistry, ) from synapse.federation.send_queue import FederationRemoteSendQueue from synapse.federation.transaction_queue import TransactionQueue @@ -426,7 +427,10 @@ class HomeServer(object): return RoomMemberMasterHandler(self) def build_federation_registry(self): - return FederationHandlerRegistry() + if self.config.worker_app: + return ReplicationFederationHandlerRegistry(self) + else: + return FederationHandlerRegistry() def build_server_notices_manager(self): if self.config.worker_app: |