diff options
| author | reivilibre <oliverw@matrix.org> | 2023-05-26 14:28:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-26 14:28:55 +0000 |
| commit | c775d80b73b7930b9541e353fc24dcef66579e48 (patch) | |
| tree | d7a2460c1857ee9583cb8ac4aed4591b6ff8bbd1 /synapse/config | |
| parent | Add `dch` and `notify-send` to the development Nix flake so that the release ... (diff) | |
| download | synapse-c775d80b73b7930b9541e353fc24dcef66579e48.tar.xz | |
Fix a bug introduced in Synapse v1.84.0 where workers do not start up when no `instance_map` was provided. (#15672)
* Fix #15669: always populate instance map even if it was empty * Fix some tests * Fix more tests * Newsfile Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org> * CI fix: don't forget to update apt repository sources before installing olddeps deps * Add test testing the backwards compatibility --------- Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org>
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/workers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/workers.py b/synapse/config/workers.py index d2311cc857..38e13dd7b5 100644 --- a/synapse/config/workers.py +++ b/synapse/config/workers.py @@ -222,7 +222,7 @@ class WorkerConfig(Config): # itself doesn't need this data as it would never have to talk to itself. instance_map: Dict[str, Any] = config.get("instance_map", {}) - if instance_map and self.instance_name is not MAIN_PROCESS_INSTANCE_NAME: + if self.instance_name is not MAIN_PROCESS_INSTANCE_NAME: # The host used to connect to the main synapse main_host = config.get("worker_replication_host", None) |