Fix version that worker_main_http_uri is redundant from (#14476)

* Fix version that `worker_main_http_uri` is redundant from

* Changelog
This commit is contained in:
David Robertson 2022-11-17 16:11:08 +00:00 committed by GitHub
parent e7132c3f81
commit 01a0527892
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions

1
changelog.d/14476.misc Normal file
View File

@ -0,0 +1 @@
Remove the `worker_main_http_uri` configuration setting. This is now handled via internal replication.

View File

@ -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)). [`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 * If handling HTTP requests, a [`worker_listeners`](usage/configuration/config_documentation.md#worker_listeners) option
with an `http` listener. with an `http` listener.
* **Synapse 1.71 and older:** if handling the `^/_matrix/client/v3/keys/upload` endpoint, the HTTP URI for * **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.72 and newer. 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: For example:

View File

@ -166,7 +166,7 @@ class WorkerConfig(Config):
self.worker_main_http_uri = config.get("worker_main_http_uri", None) self.worker_main_http_uri = config.get("worker_main_http_uri", None)
if self.worker_main_http_uri is not None: if self.worker_main_http_uri is not None:
logger.warning( 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." "It can be safely removed from your configuration."
) )