diff options
| author | Matthew Hodgson <matthew@arasphere.net> | 2018-03-14 15:38:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-14 15:38:05 +0000 |
| commit | 056a6df5462d45eeb4cc9870492f6147677e7213 (patch) | |
| tree | a3a4c576bfd2749d297315a9e6b5cd3f53161d87 /synapse/server.py | |
| parent | pep8 (diff) | |
| parent | Merge pull request #2995 from matrix-org/erikj/enable_membership_worker (diff) | |
| download | synapse-056a6df5462d45eeb4cc9870492f6147677e7213.tar.xz | |
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/server.py b/synapse/server.py index 43c6e0a6d6..cd0c1a51be 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -47,7 +47,8 @@ from synapse.handlers.device import DeviceHandler from synapse.handlers.e2e_keys import E2eKeysHandler from synapse.handlers.presence import PresenceHandler from synapse.handlers.room_list import RoomListHandler -from synapse.handlers.room_member import RoomMemberHandler +from synapse.handlers.room_member import RoomMemberMasterHandler +from synapse.handlers.room_member_worker import RoomMemberWorkerHandler from synapse.handlers.set_password import SetPasswordHandler from synapse.handlers.sync import SyncHandler from synapse.handlers.typing import TypingHandler @@ -392,7 +393,9 @@ class HomeServer(object): return SpamChecker(self) def build_room_member_handler(self): - return RoomMemberHandler(self) + if self.config.worker_app: + return RoomMemberWorkerHandler(self) + return RoomMemberMasterHandler(self) def build_federation_registry(self): return FederationHandlerRegistry() |