Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Add the batch_send endpoint to generic workers #12868

Merged
merged 4 commits into from
May 25, 2022
Merged

Add the batch_send endpoint to generic workers #12868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60610d9
Add the `batch_send` endpoint to generic workers
Fizzadar May 25, 2022
4a3c361
Add changelog file
Fizzadar May 25, 2022
bd3bc4a
Remove newline from changelog file
Fizzadar May 25, 2022
7b0b7f3
Add batch send endpoint to Docker `event_creator` worker config
Fizzadar May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/12868.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Enable the `batch_send` endpoint on synapse worker processes. Contributed by Nick @ Beeper.
1 change: 1 addition & 0 deletions docker/configure_workers_and_start.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@
"^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/(join|invite|leave|ban|unban|kick)$",
"^/_matrix/client/(api/v1|r0|v3|unstable)/join/",
"^/_matrix/client/(api/v1|r0|v3|unstable)/profile/",
"^/_matrix/client/(v1|unstable/org.matrix.msc2716)/rooms/.*/batch_send",
],
"shared_extra_conf": {},
"worker_extra_conf": "",
Expand Down
1 change: 1 addition & 0 deletions docs/workers.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ information.
^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/members$
^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/state$
^/_matrix/client/(v1|unstable/org.matrix.msc2946)/rooms/.*/hierarchy$
^/_matrix/client/(v1|unstable/org.matrix.msc2716)/rooms/.*/batch_send$
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This (and other references) are incorrect, it is not available under a v1 endpoint yet, only the unstable version.

^/_matrix/client/unstable/im.nheko.summary/rooms/.*/summary$
^/_matrix/client/(r0|v3|unstable)/account/3pid$
^/_matrix/client/(r0|v3|unstable)/devices$
Expand Down
2 changes: 2 additions & 0 deletions synapse/app/generic_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
read_marker,
receipts,
room,
room_batch,
room_keys,
sendtodevice,
sync,
Expand Down Expand Up @@ -308,6 +309,7 @@ def _listen_http(self, listener_config: ListenerConfig) -> None:
room.register_servlets(self, resource, is_worker=True)
room.register_deprecated_servlets(self, resource)
initial_sync.register_servlets(self, resource)
room_batch.register_servlets(self, resource)
room_keys.register_servlets(self, resource)
tags.register_servlets(self, resource)
account_data.register_servlets(self, resource)
Expand Down