diff options
| author | Erik Johnston <erik@matrix.org> | 2020-02-07 11:14:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-07 11:14:19 +0000 |
| commit | de2d267375069c2d22bceb0d6ef9c6f5a77380e3 (patch) | |
| tree | 12636dca8ea90ea5369207b7aea134521a1fc8f5 /synapse/app | |
| parent | Admin api to add an email address (#6789) (diff) | |
| download | synapse-de2d267375069c2d22bceb0d6ef9c6f5a77380e3.tar.xz | |
Allow moving group read APIs to workers (#6866)
Diffstat (limited to 'synapse/app')
| -rw-r--r-- | synapse/app/client_reader.py | 3 | ||||
| -rw-r--r-- | synapse/app/federation_reader.py | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/synapse/app/client_reader.py b/synapse/app/client_reader.py index ca96da6a4a..7fa91a3b11 100644 --- a/synapse/app/client_reader.py +++ b/synapse/app/client_reader.py @@ -57,6 +57,7 @@ from synapse.rest.client.v1.room import ( RoomStateRestServlet, ) from synapse.rest.client.v1.voip import VoipRestServlet +from synapse.rest.client.v2_alpha import groups from synapse.rest.client.v2_alpha.account import ThreepidRestServlet from synapse.rest.client.v2_alpha.keys import KeyChangesServlet, KeyQueryServlet from synapse.rest.client.v2_alpha.register import RegisterRestServlet @@ -124,6 +125,8 @@ class ClientReaderServer(HomeServer): PushRuleRestServlet(self).register(resource) VersionsRestServlet(self).register(resource) + groups.register_servlets(self, resource) + resources.update({"/_matrix/client": resource}) root_resource = create_resource_tree(resources, NoResource()) diff --git a/synapse/app/federation_reader.py b/synapse/app/federation_reader.py index 1f1cea1416..5e17ef1396 100644 --- a/synapse/app/federation_reader.py +++ b/synapse/app/federation_reader.py @@ -35,6 +35,7 @@ from synapse.replication.slave.storage.account_data import SlavedAccountDataStor from synapse.replication.slave.storage.appservice import SlavedApplicationServiceStore from synapse.replication.slave.storage.directory import DirectoryStore from synapse.replication.slave.storage.events import SlavedEventStore +from synapse.replication.slave.storage.groups import SlavedGroupServerStore from synapse.replication.slave.storage.keys import SlavedKeyStore from synapse.replication.slave.storage.profile import SlavedProfileStore from synapse.replication.slave.storage.push_rule import SlavedPushRuleStore @@ -66,6 +67,7 @@ class FederationReaderSlavedStore( SlavedEventStore, SlavedKeyStore, SlavedRegistrationStore, + SlavedGroupServerStore, RoomStore, DirectoryStore, SlavedTransactionStore, |