Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5505 from matrix-org/erikj/messages_worker 

Support pagination API in client_reader worker
This commit is contained in:
Erik Johnston 2019-06-21 13:20:46 +01:00 committed by GitHub
parent 7456698241 60b912cf0d
commit 5f8a612af1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5505.feature Normal file
View File

@ -0,0 +1 @@
Add support for handling pagination APIs on client reader worker.

7
docs/workers.rst
View File

@ -239,6 +239,13 @@ be routed to the same instance::
^/_matrix/client/(r0|unstable)/register$ ^/_matrix/client/(r0|unstable)/register$
Pagination requests can also be handled, but all requests with the same path
room must be routed to the same instance. Additionally, care must be taken to
ensure that the purge history admin API is not used while pagination requests
for the room are in flight::
^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/messages$
``synapse.app.user_dir`` ``synapse.app.user_dir``
~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~

2
synapse/app/client_reader.py
View File

@ -52,6 +52,7 @@ from synapse.rest.client.v1.room import (
PublicRoomListRestServlet, PublicRoomListRestServlet,
RoomEventContextServlet, RoomEventContextServlet,
RoomMemberListRestServlet, RoomMemberListRestServlet,
RoomMessageListRestServlet,
RoomStateRestServlet, RoomStateRestServlet,
) )
from synapse.rest.client.v1.voip import VoipRestServlet from synapse.rest.client.v1.voip import VoipRestServlet
@ -109,6 +110,7 @@ class ClientReaderServer(HomeServer):
JoinedRoomMemberListRestServlet(self).register(resource) JoinedRoomMemberListRestServlet(self).register(resource)
RoomStateRestServlet(self).register(resource) RoomStateRestServlet(self).register(resource)
RoomEventContextServlet(self).register(resource) RoomEventContextServlet(self).register(resource)
RoomMessageListRestServlet(self).register(resource)
RegisterRestServlet(self).register(resource) RegisterRestServlet(self).register(resource)
LoginRestServlet(self).register(resource) LoginRestServlet(self).register(resource)
ThreepidRestServlet(self).register(resource) ThreepidRestServlet(self).register(resource)