diff options
| author | Erik Johnston <erikj@jki.re> | 2019-03-15 10:35:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-15 10:35:38 +0000 |
| commit | b0fa3f6ff3a84c66a2cd6b8e18413fe051ff257f (patch) | |
| tree | eda8410722f1f740778c723886d7abc33f8747d1 /synapse/app/homeserver.py | |
| parent | Add systemd setup that supports workers (#4662) (diff) | |
| parent | Correctly handle all command line options (diff) | |
| download | synapse-b0fa3f6ff3a84c66a2cd6b8e18413fe051ff257f.tar.xz | |
Merge pull request #4853 from matrix-org/erikj/worker_docker_ci
Allow passing --daemonize to workers
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index e0431608e8..869c028d1f 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -637,17 +637,15 @@ def run(hs): # be quite busy the first few minutes clock.call_later(5 * 60, start_phone_stats_home) - if hs.config.daemonize and hs.config.print_pidfile: - print(hs.config.pid_file) - _base.start_reactor( "synapse-homeserver", - hs.config.soft_file_limit, - hs.config.gc_thresholds, - hs.config.pid_file, - hs.config.daemonize, - hs.config.cpu_affinity, - logger, + soft_file_limit=hs.config.soft_file_limit, + gc_thresholds=hs.config.gc_thresholds, + pid_file=hs.config.pid_file, + daemonize=hs.config.daemonize, + cpu_affinity=hs.config.cpu_affinity, + print_pidfile=hs.config.print_pidfile, + logger=logger, ) |