diff options
| author | Erik Johnston <erikj@jki.re> | 2018-01-12 12:00:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-12 12:00:07 +0000 |
| commit | fefeb0ab0ef57778f97a1a12ffbe8a2c9a3a7fb2 (patch) | |
| tree | 98e7ace4f8e22fc5d242c6338795d18c75c02d9a /synapse/config | |
| parent | Merge pull request #2766 from matrix-org/rav/room_event (diff) | |
| parent | Actually make it work (diff) | |
| download | synapse-fefeb0ab0ef57778f97a1a12ffbe8a2c9a3a7fb2.tar.xz | |
Merge pull request #2774 from matrix-org/erikj/synctl
When using synctl with workers, don't start the main synapse automatically
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") |