summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-21 14:36:03 +0100
committerGitHub <noreply@github.com>2019-06-21 14:36:03 +0100
commit8fecb5fcbf9b7875e2b3723544917a8532c26a28 (patch)
treee7488be869f9e36c3cbeb89b2f84b9ab622bcfb1
parentMerge pull request #5505 from matrix-org/erikj/messages_worker (diff)
parentNewsfile (diff)
downloadsynapse-8fecb5fcbf9b7875e2b3723544917a8532c26a28.tar.xz
Merge pull request #5513 from matrix-org/erikj/fix_messages_token
Fix /messages on worker when no token supplied
-rw-r--r--changelog.d/5513.feature1
-rw-r--r--synapse/app/client_reader.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/changelog.d/5513.feature b/changelog.d/5513.feature
new file mode 100644

index 0000000000..5c6bab2c31 --- /dev/null +++ b/changelog.d/5513.feature
@@ -0,0 +1 @@ +Add support for handling pagination APIs on client reader worker. diff --git a/synapse/app/client_reader.py b/synapse/app/client_reader.py
index fb82206762..90bc79cdda 100644 --- a/synapse/app/client_reader.py +++ b/synapse/app/client_reader.py
@@ -37,6 +37,7 @@ from synapse.replication.slave.storage.deviceinbox import SlavedDeviceInboxStore from synapse.replication.slave.storage.devices import SlavedDeviceStore 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 @@ -75,6 +76,7 @@ class ClientReaderSlavedStore( SlavedDeviceStore, SlavedReceiptsStore, SlavedPushRuleStore, + SlavedGroupServerStore, SlavedAccountDataStore, SlavedEventStore, SlavedKeyStore,