diff --git a/deploy/docker/fs/etc/supervisor/supervisord.conf b/deploy/docker/fs/etc/supervisor/supervisord.conf index 21d4f98d69..eb1bedac47 100644 --- a/deploy/docker/fs/etc/supervisor/supervisord.conf +++ b/deploy/docker/fs/etc/supervisor/supervisord.conf @@ -10,7 +10,7 @@ username=%(ENV_APPSMITH_SUPERVISOR_USER)s password=%(ENV_APPSMITH_SUPERVISOR_PASSWORD)s [supervisord] -logfile=%(ENV_APPSMITH_LOG_DIR)s/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log) +logfile=%(ENV_APPSMITH_LOG_DIR)s/supervisor/%(ENV_HOSTNAME)s-stdout.log ; (main log file;default $CWD/supervisord.log) pidfile=%(ENV_TMP)s/supervisord.pid ; (supervisord pidfile;default supervisord.pid) childlogdir=%(ENV_APPSMITH_LOG_DIR)s/supervisor ; ('AUTO' child log dir, default $TEMP) stdout_logfile_maxbytes = 0 @@ -35,13 +35,12 @@ serverurl=unix://%(ENV_TMP)s/supervisor.sock ; use a unix:// URL for a unix soc files = %(ENV_SUPERVISORD_CONF_TARGET)s/*.conf [eventlistener:stdout] +# This eventlistener sends logs to the python handler in /usr/lib/python3/dist-packages/supervisor/appsmith_supervisor_stdout.py created in this repo +# It sends logs for individual processes to stdout/stderr of the main process, which lets logging pipelines to capture logs from each process. +# Supervisor then wants to send these messages to a logfile by default, so directing them to /dev/null prevents double logging. command = python3 -m supervisor.appsmith_supervisor_stdout buffer_size = 10000 events = PROCESS_LOG result_handler = supervisor.appsmith_supervisor_stdout:event_handler -stdout_logfile=%(ENV_APPSMITH_LOG_DIR)s/supervisor/access-supervisor-%(ENV_HOSTNAME)s.log -stderr_logfile=%(ENV_APPSMITH_LOG_DIR)s/supervisor/error-supervisor-%(ENV_HOSTNAME)s.log -stdout_logfile_maxbytes=10MB -stderr_logfile_maxbytes=10MB -stdout_logfile_backups=10 -stderr_logfile_backups=10 +stdout_logfile=/dev/null +stderr_logfile=/dev/null diff --git a/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs b/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs index ee605f92cf..9a298c485c 100644 --- a/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs +++ b/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs @@ -42,7 +42,6 @@ const parts = [] parts.push(` { - debug admin 0.0.0.0:2019 persist_config off acme_ca_root /etc/ssl/certs/ca-certificates.crt