diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2022-05-09 22:41:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-09 22:41:06 +0100 |
| commit | 34e84fee681e8c4503e17b28d6dc50dccfb6d84f (patch) | |
| tree | 6d061d38e3bbfcb457f763ce0211c92eb5e0e6dd /docker | |
| parent | Fix inconsistent spelling of 'M_UNRECOGNIZED'. (#12665) (diff) | |
| download | synapse-34e84fee681e8c4503e17b28d6dc50dccfb6d84f.tar.xz | |
Tweaks to workers-under-complement (#12637)
* Bump the HS startup timeout * Log prefixes for more processes * Bump the overall timeout
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/conf-workers/supervisord.conf.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/conf-workers/supervisord.conf.j2 b/docker/conf-workers/supervisord.conf.j2 index 408ef72787..ca1f7aef8e 100644 --- a/docker/conf-workers/supervisord.conf.j2 +++ b/docker/conf-workers/supervisord.conf.j2 @@ -9,7 +9,7 @@ user=root files = /etc/supervisor/conf.d/*.conf [program:nginx] -command=/usr/sbin/nginx -g "daemon off;" +command=/usr/local/bin/prefix-log /usr/sbin/nginx -g "daemon off;" priority=500 stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 @@ -19,7 +19,7 @@ username=www-data autorestart=true [program:redis] -command=/usr/bin/redis-server /etc/redis/redis.conf --daemonize no +command=/usr/local/bin/prefix-log /usr/bin/redis-server /etc/redis/redis.conf --daemonize no priority=1 stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 @@ -29,7 +29,7 @@ username=redis autorestart=true [program:synapse_main] -command=/usr/local/bin/python -m synapse.app.homeserver --config-path="{{ main_config_path }}" --config-path=/conf/workers/shared.yaml +command=/usr/local/bin/prefix-log /usr/local/bin/python -m synapse.app.homeserver --config-path="{{ main_config_path }}" --config-path=/conf/workers/shared.yaml priority=10 # Log startup failures to supervisord's stdout/err # Regular synapse logs will still go in the configured data directory |