From 1d56a8690600208bb56b2b97a650d3e4ee7c8b48 Mon Sep 17 00:00:00 2001 From: Subhrashis Das Date: Fri, 20 Dec 2024 16:01:18 +0530 Subject: [PATCH] Standardize log patterns across all services for consistency. --- .../application_process/backend.conf | 21 ++++++++++--------- .../application_process/editor.conf | 20 +++++++++--------- .../supervisord/application_process/rts.conf | 21 ++++++++++--------- .../templates/supervisord/mongodb.conf | 21 ++++++++++--------- .../templates/supervisord/postgres.conf | 18 ++++++++-------- .../appsmith/templates/supervisord/redis.conf | 21 ++++++++++--------- 6 files changed, 63 insertions(+), 59 deletions(-) diff --git a/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/backend.conf b/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/backend.conf index a9f4ed00ecd..5951697a1ef 100644 --- a/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/backend.conf +++ b/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/backend.conf @@ -1,15 +1,16 @@ [program:backend] command=/opt/appsmith/run-with-env.sh /opt/appsmith/run-java.sh -priority=20 -autostart=true autorestart=true -startsecs=20 -startretries=3 -stdout_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/%(program_name)s-%(ENV_HOSTNAME)s.log +autostart=true +priority=20 redirect_stderr=true -stdout_logfile_maxbytes=10MB -stderr_logfile_maxbytes=10MB -stdout_logfile_backups=10 -stderr_logfile_backups=10 -stdout_events_enabled=true +startretries=3 +startsecs=20 stderr_events_enabled=true +stderr_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/%(ENV_HOSTNAME)s-stderr.log +stderr_logfile_backups=0 +stderr_logfile_maxbytes=30MB +stdout_events_enabled=true +stdout_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/%(ENV_HOSTNAME)s-stdout.log +stdout_logfile_backups=0 +stdout_logfile_maxbytes=30MB diff --git a/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/editor.conf b/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/editor.conf index 8fa54215d50..0efa5a7b4eb 100644 --- a/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/editor.conf +++ b/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/editor.conf @@ -1,16 +1,16 @@ [program:editor] command=/opt/appsmith/run-with-env.sh /opt/appsmith/run-caddy.sh -priority=25 -autostart=true autorestart=true -startsecs=0 +autostart=true +priority=25 startretries=3 -stdout_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/access-%(ENV_HOSTNAME)s.log -stderr_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/error-%(ENV_HOSTNAME)s.log -stdout_logfile_maxbytes=10MB -stderr_logfile_maxbytes=10MB -stdout_logfile_backups=2 -stderr_logfile_backups=2 -stdout_events_enabled=true +startsecs=0 stderr_events_enabled=true +stderr_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/%(ENV_HOSTNAME)s-stderr.log +stderr_logfile_backups=0 +stderr_logfile_maxbytes=30MB +stdout_events_enabled=true +stdout_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/%(ENV_HOSTNAME)s-stdout.log +stdout_logfile_backups=0 +stdout_logfile_maxbytes=30MB stopsignal=QUIT diff --git a/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/rts.conf b/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/rts.conf index 6900f17a17f..52620a0704c 100644 --- a/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/rts.conf +++ b/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/rts.conf @@ -1,16 +1,17 @@ [program:rts] directory=/opt/appsmith/rts/bundle command=/opt/appsmith/run-with-env.sh node server.js -priority=15 -autostart=true autorestart=true -startsecs=0 -startretries=3 -stdout_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/%(program_name)s-%(ENV_HOSTNAME)s.log +autostart=true +priority=15 redirect_stderr=true -stdout_logfile_maxbytes=10MB -stderr_logfile_maxbytes=10MB -stdout_logfile_backups=2 -stderr_logfile_backups=2 -stdout_events_enabled=true +startretries=3 +startsecs=0 stderr_events_enabled=true +stderr_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/%(ENV_HOSTNAME)s-stderr.log +stderr_logfile_backups=0 +stderr_logfile_maxbytes=30MB +stdout_events_enabled=true +stdout_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/%(ENV_HOSTNAME)s-stdout.log +stdout_logfile_backups=0 +stdout_logfile_maxbytes=30MB diff --git a/deploy/docker/fs/opt/appsmith/templates/supervisord/mongodb.conf b/deploy/docker/fs/opt/appsmith/templates/supervisord/mongodb.conf index 7e7b0a7bd39..07dfe18d29f 100644 --- a/deploy/docker/fs/opt/appsmith/templates/supervisord/mongodb.conf +++ b/deploy/docker/fs/opt/appsmith/templates/supervisord/mongodb.conf @@ -1,16 +1,17 @@ [program:mongodb] directory=/appsmith-stacks/data/mongodb command=mongod --port 27017 --dbpath . --logpath %(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/db.log --replSet mr1 --keyFile %(ENV_MONGODB_TMP_KEY_PATH)s --bind_ip localhost -priority=10 -autostart=true autorestart=true -startsecs=10 -startretries=3 -stdout_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/%(program_name)s.log +autostart=true +priority=10 redirect_stderr=true -stdout_logfile_maxbytes=10MB -stderr_logfile_maxbytes=10MB -stdout_logfile_backups=2 -stderr_logfile_backups=2 -stdout_events_enabled=true +startretries=3 +startsecs=10 stderr_events_enabled=true +stderr_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/%(ENV_HOSTNAME)s-stderr.log +stderr_logfile_backups=0 +stderr_logfile_maxbytes=30MB +stdout_events_enabled=true +stdout_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/%(ENV_HOSTNAME)s-stdout.log +stdout_logfile_backups=0 +stdout_logfile_maxbytes=30MB diff --git a/deploy/docker/fs/opt/appsmith/templates/supervisord/postgres.conf b/deploy/docker/fs/opt/appsmith/templates/supervisord/postgres.conf index 2dd1aa8d059..25ed14d87c9 100644 --- a/deploy/docker/fs/opt/appsmith/templates/supervisord/postgres.conf +++ b/deploy/docker/fs/opt/appsmith/templates/supervisord/postgres.conf @@ -2,15 +2,15 @@ directory=/appsmith-stacks/data/postgres/main user=postgres command=/opt/appsmith/run-postgres.sh -autostart=true autorestart=true -startretries=3 -stdout_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/%(program_name)s.log +autostart=true redirect_stderr=true -stdout_logfile_maxbytes=10MB -stderr_logfile_maxbytes=10MB -stdout_logfile_backups=2 -stderr_logfile_backups=2 -stdout_events_enabled=true +startretries=3 stderr_events_enabled=true - +stderr_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/%(ENV_HOSTNAME)s-stderr.log +stderr_logfile_backups=0 +stderr_logfile_maxbytes=30MB +stdout_events_enabled=true +stdout_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/%(ENV_HOSTNAME)s-stdout.log +stdout_logfile_backups=0 +stdout_logfile_maxbytes=30MB diff --git a/deploy/docker/fs/opt/appsmith/templates/supervisord/redis.conf b/deploy/docker/fs/opt/appsmith/templates/supervisord/redis.conf index 5fb91c84fe9..2ed610a0b90 100644 --- a/deploy/docker/fs/opt/appsmith/templates/supervisord/redis.conf +++ b/deploy/docker/fs/opt/appsmith/templates/supervisord/redis.conf @@ -3,16 +3,17 @@ directory=/etc/redis ; The `--save` is for saving session data to disk more often, so recent sessions aren't cleared on restart. ; The empty string to `--logfile` is for logging to stdout so that supervisor can capture it. command=redis-server --save 15 1 --dir /appsmith-stacks/data/redis --daemonize no --logfile "" -priority=5 -autostart=true autorestart=true -startsecs=0 -startretries=3 -stdout_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/%(program_name)s.log +autostart=true +priority=5 redirect_stderr=true -stdout_logfile_maxbytes=10MB -stderr_logfile_maxbytes=10MB -stdout_logfile_backups=2 -stderr_logfile_backups=2 -stdout_events_enabled=true +startretries=3 +startsecs=0 stderr_events_enabled=true +stderr_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/%(ENV_HOSTNAME)s-stderr.log +stderr_logfile_backups=0 +stderr_logfile_maxbytes=30MB +stdout_events_enabled=true +stdout_logfile=%(ENV_APPSMITH_LOG_DIR)s/%(program_name)s/%(ENV_HOSTNAME)s-stdout.log +stdout_logfile_backups=0 +stdout_logfile_maxbytes=30MB