Merge pull request #2716 from danswer-ai/hotfix/v0.7-background-logs

backport: rely on stdout redirection for supervisord logging (#2711)
This commit is contained in:
rkuo-danswer
2024-10-07 15:48:43 -07:00
committed by GitHub

View File

@@ -30,25 +30,25 @@ command=celery -A danswer.background.celery.celery_run:celery_app worker
--concurrency=4 --concurrency=4
--prefetch-multiplier=1 --prefetch-multiplier=1
--loglevel=INFO --loglevel=INFO
--logfile=/var/log/celery_worker_primary_supervisor.log
--hostname=primary@%%n --hostname=primary@%%n
-Q celery -Q celery
environment=LOG_FILE_NAME=celery_worker_primary stdout_logfile=/var/log/celery_worker_primary.log
stdout_logfile_maxbytes=16MB
redirect_stderr=true redirect_stderr=true
autorestart=true autorestart=true
startsecs=10 startsecs=10
stopasgroup=true stopasgroup=true
[program:celery_worker_light] [program:celery_worker_light]
command=celery -A danswer.background.celery.celery_run:celery_app worker command=bash -c "celery -A danswer.background.celery.celery_run:celery_app worker \
--pool=threads --pool=threads \
--concurrency=16 --concurrency=${CELERY_WORKER_LIGHT_CONCURRENCY:-24} \
--prefetch-multiplier=8 --prefetch-multiplier=${CELERY_WORKER_LIGHT_PREFETCH_MULTIPLIER:-8} \
--loglevel=INFO --loglevel=INFO \
--logfile=/var/log/celery_worker_light_supervisor.log --hostname=light@%%n \
--hostname=light@%%n -Q vespa_metadata_sync,connector_deletion"
-Q vespa_metadata_sync,connector_deletion stdout_logfile=/var/log/celery_worker_light.log
environment=LOG_FILE_NAME=celery_worker_light stdout_logfile_maxbytes=16MB
redirect_stderr=true redirect_stderr=true
autorestart=true autorestart=true
startsecs=10 startsecs=10
@@ -60,10 +60,10 @@ command=celery -A danswer.background.celery.celery_run:celery_app worker
--concurrency=4 --concurrency=4
--prefetch-multiplier=1 --prefetch-multiplier=1
--loglevel=INFO --loglevel=INFO
--logfile=/var/log/celery_worker_heavy_supervisor.log
--hostname=heavy@%%n --hostname=heavy@%%n
-Q connector_pruning -Q connector_pruning
environment=LOG_FILE_NAME=celery_worker_heavy stdout_logfile=/var/log/celery_worker_heavy.log
stdout_logfile_maxbytes=16MB
redirect_stderr=true redirect_stderr=true
autorestart=true autorestart=true
startsecs=10 startsecs=10
@@ -72,8 +72,8 @@ stopasgroup=true
# Job scheduler for periodic tasks # Job scheduler for periodic tasks
[program:celery_beat] [program:celery_beat]
command=celery -A danswer.background.celery.celery_run:celery_app beat command=celery -A danswer.background.celery.celery_run:celery_app beat
--logfile=/var/log/celery_beat_supervisor.log stdout_logfile=/var/log/celery_beat.log
environment=LOG_FILE_NAME=celery_beat stdout_logfile_maxbytes=16MB
redirect_stderr=true redirect_stderr=true
startsecs=10 startsecs=10
stopasgroup=true stopasgroup=true
@@ -94,17 +94,12 @@ startsecs=60
# No log rotation here, since it's stdout it's handled by the Docker container logging # No log rotation here, since it's stdout it's handled by the Docker container logging
[program:log-redirect-handler] [program:log-redirect-handler]
command=tail -qF command=tail -qF
/var/log/celery_beat.log
/var/log/celery_worker_primary.log
/var/log/celery_worker_light.log
/var/log/celery_worker_heavy.log
/var/log/document_indexing_info.log /var/log/document_indexing_info.log
/var/log/celery_beat_supervisor.log
/var/log/celery_worker_primary_supervisor.log
/var/log/celery_worker_light_supervisor.log
/var/log/celery_worker_heavy_supervisor.log
/var/log/celery_beat_debug.log
/var/log/celery_worker_primary_debug.log
/var/log/celery_worker_light_debug.log
/var/log/celery_worker_heavy_debug.log
/var/log/slack_bot_debug.log /var/log/slack_bot_debug.log
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes = 0 # must be set to 0 when stdout_logfile=/dev/stdout
redirect_stderr=true
autorestart=true autorestart=true