diff options
author | Erik Johnston <erik@matrix.org> | 2018-01-12 10:39:27 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-01-12 10:39:27 +0000 |
commit | f4d93ae424bec48f7d0d68d885942dc83d5780d7 (patch) | |
tree | 6366a247b71b8a1997afb287dd6cf4441e29aa9b /synapse/config | |
parent | Refactor (diff) | |
download | synapse-f4d93ae424bec48f7d0d68d885942dc83d5780d7.tar.xz |
Actually make it work
Diffstat (limited to 'synapse/config')
-rw-r--r-- | synapse/config/workers.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/config/workers.py b/synapse/config/workers.py index c5a5a8919c..4b6884918d 100644 --- a/synapse/config/workers.py +++ b/synapse/config/workers.py @@ -23,6 +23,11 @@ class WorkerConfig(Config): def read_config(self, config): self.worker_app = config.get("worker_app") + + # Canonicalise worker_app so that master always has None + if self.worker_app == "synapse.app.homeserver": + self.worker_app = None + self.worker_listeners = config.get("worker_listeners") self.worker_daemonize = config.get("worker_daemonize") self.worker_pid_file = config.get("worker_pid_file") |