Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit fe83f1b

Browse files
David RobertsonH-Shay
authored andcommitted
Fix version that worker_main_http_uri is redundant from (#14476)
* Fix version that `worker_main_http_uri` is redundant from * Changelog
1 parent 3355491 commit fe83f1b

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

changelog.d/14476.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove the `worker_main_http_uri` configuration setting. This is now handled via internal replication.

docs/workers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ In the config file for each worker, you must specify:
135135
[`worker_replication_http_port`](usage/configuration/config_documentation.md#worker_replication_http_port)).
136136
* If handling HTTP requests, a [`worker_listeners`](usage/configuration/config_documentation.md#worker_listeners) option
137137
with an `http` listener.
138-
* **Synapse 1.71 and older:** if handling the `^/_matrix/client/v3/keys/upload` endpoint, the HTTP URI for
139-
the main process (`worker_main_http_uri`). This config option is no longer required and is ignored when running Synapse 1.72 and newer.
138+
* **Synapse 1.72 and older:** if handling the `^/_matrix/client/v3/keys/upload` endpoint, the HTTP URI for
139+
the main process (`worker_main_http_uri`). This config option is no longer required and is ignored when running Synapse 1.73 and newer.
140140

141141
For example:
142142

synapse/config/workers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ def read_config(self, config: JsonDict, **kwargs: Any) -> None:
166166
self.worker_main_http_uri = config.get("worker_main_http_uri", None)
167167
if self.worker_main_http_uri is not None:
168168
logger.warning(
169-
"The config option worker_main_http_uri is unused since Synapse 1.72. "
169+
"The config option worker_main_http_uri is unused since Synapse 1.73. "
170170
"It can be safely removed from your configuration."
171171
)
172172

0 commit comments

Comments
 (0)