summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-03-14 14:29:33 +0000
committerGitHub <noreply@github.com>2018-03-14 14:29:33 +0000
commit57db62e554a0197e81f2fcd853243bafc094d3c0 (patch)
tree8f9bd24f9a8652af56ce15095383ad229911d831 /synapse/server.py
parentMerge pull request #2989 from matrix-org/erikj/profile_cache_master (diff)
parentFix imports (diff)
downloadsynapse-57db62e554a0197e81f2fcd853243bafc094d3c0.tar.xz
Merge pull request #2992 from matrix-org/erikj/implement_member_workre
Implement RoomMemberWorkerHandler
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/server.py b/synapse/server.py
index 763f0f5a68..cd0c1a51be 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -48,6 +48,7 @@ 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 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
@@ -393,7 +394,7 @@ class HomeServer(object):
 
     def build_room_member_handler(self):
         if self.config.worker_app:
-            raise Exception("Can't use RoomMemberHandler on workers")
+            return RoomMemberWorkerHandler(self)
         return RoomMemberMasterHandler(self)
 
     def build_federation_registry(self):