diff options
| author | Erik Johnston <erikj@jki.re> | 2018-03-13 17:40:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-13 17:40:00 +0000 |
| commit | 1a69c6d590b8f93dd54b06e556b1d26f2a7393b5 (patch) | |
| tree | 1b9ab0b99e181e8d40b7f6e7743fdc08394f72fb /synapse/server.py | |
| parent | Merge pull request #2978 from matrix-org/erikj/refactor_replication_layer (diff) | |
| parent | Raise, don't return, exception (diff) | |
| download | synapse-1a69c6d590b8f93dd54b06e556b1d26f2a7393b5.tar.xz | |
Merge pull request #2987 from matrix-org/erikj/split_room_member_handler
Split RoomMemberHandler into base and master class
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/server.py b/synapse/server.py index 43c6e0a6d6..763f0f5a68 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -47,7 +47,7 @@ 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.set_password import SetPasswordHandler from synapse.handlers.sync import SyncHandler from synapse.handlers.typing import TypingHandler @@ -392,7 +392,9 @@ class HomeServer(object): return SpamChecker(self) def build_room_member_handler(self): - return RoomMemberHandler(self) + if self.config.worker_app: + raise Exception("Can't use RoomMemberHandler on workers") + return RoomMemberMasterHandler(self) def build_federation_registry(self): return FederationHandlerRegistry() |