diff options
| author | Erik Johnston <erik@matrix.org> | 2018-01-12 10:11:12 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-01-12 10:11:12 +0000 |
| commit | f68e4cf690df9bbc70540804fd8cc590d40c2149 (patch) | |
| tree | a8d2022d4716bd218b2e3de58ac6d619337103fd | |
| parent | When using synctl with workers, don't start the main synapse automatically (diff) | |
| download | synapse-f68e4cf690df9bbc70540804fd8cc590d40c2149.tar.xz | |
Refactor
Diffstat (limited to '')
| -rwxr-xr-x | synapse/app/synctl.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/synapse/app/synctl.py b/synapse/app/synctl.py index 049956746e..4bd8f735ff 100755 --- a/synapse/app/synctl.py +++ b/synapse/app/synctl.py @@ -211,21 +211,16 @@ def main(): or worker_config("pid_file") or pidfile ) - workers.append(Worker( - "synapse.app.homeserver", - worker_configfile, - worker_pidfile, - worker_config.get("synctl_cache_factor") or cache_factor, - )) + worker_cache_factor = worker_config.get("synctl_cache_factor") or cache_factor else: worker_pidfile = worker_config["worker_pid_file"] worker_daemonize = worker_config["worker_daemonize"] assert worker_daemonize, "In config %r: expected '%s' to be True" % ( worker_configfile, "worker_daemonize") worker_cache_factor = worker_config.get("synctl_cache_factor") - workers.append(Worker( - worker_app, worker_configfile, worker_pidfile, worker_cache_factor, - )) + workers.append(Worker( + worker_app, worker_configfile, worker_pidfile, worker_cache_factor, + )) action = options.action |