Add the batch_send endpoint to generic workers (matrix-org#12868)

ebauger · May 25, 2022 · 1f9013c · 1f9013c
1 parent 33e2916
commit 1f9013c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
diff --git a/changelog.d/12868.misc b/changelog.d/12868.misc
@@ -0,0 +1 @@
+Enable the `batch_send` endpoint on synapse worker processes. Contributed by Nick @ Beeper.
diff --git a/docker/configure_workers_and_start.py b/docker/configure_workers_and_start.py
@@ -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": "",

diff --git a/docs/workers.md b/docs/workers.md
@@ -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$
     ^/_matrix/client/unstable/im.nheko.summary/rooms/.*/summary$
     ^/_matrix/client/(r0|v3|unstable)/account/3pid$
     ^/_matrix/client/(r0|v3|unstable)/account/whoami$

diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py
@@ -78,6 +78,7 @@
     read_marker,
     receipts,
     room,
+    room_batch,
     room_keys,
     sendtodevice,
     sync,
@@ -309,6 +310,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)
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.