diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2022-12-02 13:10:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-02 13:10:05 -0500 |
| commit | f685318c2aa5d4a54239f7fc444bdaca6ba975bd (patch) | |
| tree | 881c6836ff152d46247f90e23e41d0da54f6c552 /synapse/rest/client/room.py | |
| parent | Fix Rust lint CI (#14602) (diff) | |
| download | synapse-f685318c2aa5d4a54239f7fc444bdaca6ba975bd.tar.xz | |
Use ClientRestResource on both the main process and workers. (#14528)
Add logic to ClientRestResource to decide whether to mount servlets or not based on whether the current process is a worker. This is clearer to see what a worker runs than the completely separate / copy & pasted list of servlets being mounted for workers.
Diffstat (limited to 'synapse/rest/client/room.py')
| -rw-r--r-- | synapse/rest/client/room.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py index 636cc62877..e70aa381f3 100644 --- a/synapse/rest/client/room.py +++ b/synapse/rest/client/room.py @@ -1395,9 +1395,7 @@ class RoomSummaryRestServlet(ResolveRoomIdMixin, RestServlet): ) -def register_servlets( - hs: "HomeServer", http_server: HttpServer, is_worker: bool = False -) -> None: +def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None: RoomStateEventRestServlet(hs).register(http_server) RoomMemberListRestServlet(hs).register(http_server) JoinedRoomMemberListRestServlet(hs).register(http_server) @@ -1421,7 +1419,7 @@ def register_servlets( TimestampLookupRestServlet(hs).register(http_server) # Some servlets only get registered for the main process. - if not is_worker: + if hs.config.worker.worker_app is None: RoomForgetRestServlet(hs).register(http_server) |