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/keys.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/keys.py')
| -rw-r--r-- | synapse/rest/client/keys.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/rest/client/keys.py b/synapse/rest/client/keys.py index ee038c7192..7873b363c0 100644 --- a/synapse/rest/client/keys.py +++ b/synapse/rest/client/keys.py @@ -376,5 +376,6 @@ def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None: KeyQueryServlet(hs).register(http_server) KeyChangesServlet(hs).register(http_server) OneTimeKeyServlet(hs).register(http_server) - SigningKeyUploadServlet(hs).register(http_server) - SignaturesUploadServlet(hs).register(http_server) + if hs.config.worker.worker_app is None: + SigningKeyUploadServlet(hs).register(http_server) + SignaturesUploadServlet(hs).register(http_server) |