diff options
| author | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2023-05-26 17:16:15 +0100 |
|---|---|---|
| committer | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2023-05-26 17:16:15 +0100 |
| commit | a1154dfc20102e7a0d937cd6afff1fceba0456cf (patch) | |
| tree | dbcba4fa9388945bc3bd1931df51862fd9d534e3 /synapse | |
| parent | Add MSC3820 (room version 11) option 2 unstable room version. (#15666) (diff) | |
| parent | Fix a typographical error in changelog (diff) | |
| download | synapse-a1154dfc20102e7a0d937cd6afff1fceba0456cf.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -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) |