summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2022-11-17 16:11:08 +0000
committerGitHub <noreply@github.com>2022-11-17 16:11:08 +0000
commit01a052789266179c70c10ea6a6253c64fd9990d2 (patch)
treed2b40a1b41096f5a2357a55a672120379e9dde50
parentFix check to ignore blank lines in incoming TCP replication (#14449) (diff)
downloadsynapse-01a052789266179c70c10ea6a6253c64fd9990d2.tar.xz
Fix version that `worker_main_http_uri` is redundant from (#14476)
* Fix version that `worker_main_http_uri` is redundant from

* Changelog
-rw-r--r--changelog.d/14476.misc1
-rw-r--r--docs/workers.md4
-rw-r--r--synapse/config/workers.py2
3 files changed, 4 insertions, 3 deletions
diff --git a/changelog.d/14476.misc b/changelog.d/14476.misc
new file mode 100644

index 0000000000..6e025329c4 --- /dev/null +++ b/changelog.d/14476.misc
@@ -0,0 +1 @@ +Remove the `worker_main_http_uri` configuration setting. This is now handled via internal replication. diff --git a/docs/workers.md b/docs/workers.md
index 4604650803..27e54c5846 100644 --- a/docs/workers.md +++ b/docs/workers.md
@@ -135,8 +135,8 @@ In the config file for each worker, you must specify: [`worker_replication_http_port`](usage/configuration/config_documentation.md#worker_replication_http_port)). * If handling HTTP requests, a [`worker_listeners`](usage/configuration/config_documentation.md#worker_listeners) option with an `http` listener. - * **Synapse 1.71 and older:** if handling the `^/_matrix/client/v3/keys/upload` endpoint, the HTTP URI for - the main process (`worker_main_http_uri`). This config option is no longer required and is ignored when running Synapse 1.72 and newer. + * **Synapse 1.72 and older:** if handling the `^/_matrix/client/v3/keys/upload` endpoint, the HTTP URI for + the main process (`worker_main_http_uri`). This config option is no longer required and is ignored when running Synapse 1.73 and newer. For example: diff --git a/synapse/config/workers.py b/synapse/config/workers.py
index c4e2273a95..913b83e174 100644 --- a/synapse/config/workers.py +++ b/synapse/config/workers.py
@@ -166,7 +166,7 @@ class WorkerConfig(Config): 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. " + "The config option worker_main_http_uri is unused since Synapse 1.73. " "It can be safely removed from your configuration." )