Skip to content

Commit 49cb8b7

Browse files
committed
Add Synapse main/master process to instance map
Related to matrix-org/synapse#15491 This doesn't hurt to be done early on, while still on Synapse v1.83.0. We'll be able to remove the `worker_replication_*` settings later, when Synapse v1.84.0 gets released and starts making use of the new `main` instance in the instance map instead of looking at the `worker_replication_*` settings.
1 parent 62c9257 commit 49cb8b7

File tree

1 file changed

+12
-3
lines changed
  • roles/custom/matrix-synapse/defaults

1 file changed

+12
-3
lines changed

roles/custom/matrix-synapse/defaults/main.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -711,9 +711,18 @@ matrix_synapse_run_background_tasks_on: "{{ (matrix_synapse_workers_enabled_list
711711
# - { 'id': 'media-repository-0', 'name': 'matrix-synapse-worker-media-repository-0', 'type': 'media_repository', 'port': 18551, 'metrics_port': 19551, 'webserving': true }
712712
matrix_synapse_workers_enabled_list: []
713713

714-
# matrix_synapse_instance_map holds the instance map used for mapping worker names (for certain generic workers only!) to where they live (host, port which handles replication traffic).
715-
# This is populated automatically based on `matrix_synapse_workers_enabled_list` during runtime, so you're not required to tweak it manually.
716-
matrix_synapse_instance_map: {}
714+
# matrix_synapse_instance_map holds the instance map used for mapping worker names (for the main process and certain generic workers only!) to where they live (host, port which handles replication traffic).
715+
# This map starts off being populated with the Synapse main (master) process,
716+
# but will be populated with workers automatically during runtime, based on `matrix_synapse_workers_enabled_list`.
717+
matrix_synapse_instance_map: |
718+
{{
719+
{
720+
'main': {
721+
'host': 'matrix-synapse',
722+
'port': matrix_synapse_replication_http_port,
723+
},
724+
}
725+
}}
717726
718727
# Redis information
719728
matrix_synapse_redis_enabled: false

0 commit comments

Comments
 (0)