summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorrealtyem <realtyem@gmail.com>2022-11-16 16:16:25 -0600
committerGitHub <noreply@github.com>2022-11-16 22:16:25 +0000
commitc15e9a0edb696990365ac5a4e5be847b5ae23921 (patch)
tree45ec8a2c4b810899966b5675482e63093d9b6eba /synapse/config
parentMerge branch 'release-v1.72' into develop (diff)
downloadsynapse-c15e9a0edb696990365ac5a4e5be847b5ae23921.tar.xz
Remove need for `worker_main_http_uri` setting to use /keys/upload. (#14400)
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/workers.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/config/workers.py b/synapse/config/workers.py
index 88b3168cbc..c4e2273a95 100644
--- a/synapse/config/workers.py
+++ b/synapse/config/workers.py
@@ -162,7 +162,13 @@ class WorkerConfig(Config):
         self.worker_name = config.get("worker_name", self.worker_app)
         self.instance_name = self.worker_name or "master"
 
+        # FIXME: Remove this check after a suitable amount of time.
         self.worker_main_http_uri = config.get("worker_main_http_uri", None)
+        if self.worker_main_http_uri is not None:
+            logger.warning(
+                "The config option worker_main_http_uri is unused since Synapse 1.72. "
+                "It can be safely removed from your configuration."
+            )
 
         # This option is really only here to support `--manhole` command line
         # argument.