From b5f6aac3aa5ee287cfb426dada086c3a0ac637bb Mon Sep 17 00:00:00 2001 From: Hao Liu Date: Mon, 11 Dec 2023 16:31:54 -0500 Subject: [PATCH] Correct misuse of stdxxx_event_enabled Not every log messages need to be emitted as a event! --- .../templates/supervisor_rsyslog.conf.j2 | 5 +- tools/docker-compose/supervisor.conf | 64 ++++++++++++------- 2 files changed, 45 insertions(+), 24 deletions(-) diff --git a/tools/ansible/roles/dockerfile/templates/supervisor_rsyslog.conf.j2 b/tools/ansible/roles/dockerfile/templates/supervisor_rsyslog.conf.j2 index 0f6c3df426..8d8501ea65 100644 --- a/tools/ansible/roles/dockerfile/templates/supervisor_rsyslog.conf.j2 +++ b/tools/ansible/roles/dockerfile/templates/supervisor_rsyslog.conf.j2 @@ -15,6 +15,7 @@ stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 +stderr_events_enabled = true [program:awx-rsyslog-configurer] {% if kube_dev | bool %} @@ -65,8 +66,8 @@ buffer_size = 100 events=PROCESS_LOG_STDERR priority=0 autorestart=true -stdout_events_enabled = true -stderr_events_enabled = true +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 [unix_http_server] file=/var/run/supervisor/supervisor.rsyslog.sock diff --git a/tools/docker-compose/supervisor.conf b/tools/docker-compose/supervisor.conf index 8ae0ddaf59..ec3e32f9d1 100644 --- a/tools/docker-compose/supervisor.conf +++ b/tools/docker-compose/supervisor.conf @@ -8,16 +8,20 @@ command = awx-manage run_dispatcher autorestart = true stopasgroup=true killasgroup=true -stdout_events_enabled = true -stderr_events_enabled = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 [program:awx-receiver] command = awx-manage run_callback_receiver autorestart = true stopasgroup=true killasgroup=true -stdout_events_enabled = true -stderr_events_enabled = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 [program:awx-wsrelay] command = awx-manage run_wsrelay @@ -25,8 +29,10 @@ autorestart = true autorestart = true stopasgroup=true killasgroup=true -stdout_events_enabled = true -stderr_events_enabled = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 [program:awx-ws-heartbeat] command = awx-manage run_ws_heartbeat @@ -34,8 +40,10 @@ autorestart = true autorestart = true stopasgroup=true killasgroup=true -stdout_events_enabled = true -stderr_events_enabled = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 [program:awx-rsyslog-configurer] command = awx-manage run_rsyslog_configurer @@ -64,32 +72,40 @@ stopwaitsecs = 1 stopsignal=KILL stopasgroup=true killasgroup=true -stdout_events_enabled = true -stderr_events_enabled = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 [program:awx-daphne] command = make daphne autorestart = true stopasgroup=true killasgroup=true -stdout_events_enabled = true -stderr_events_enabled = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 [program:awx-nginx] command = make nginx autorestart = true stopasgroup=true killasgroup=true -stdout_events_enabled = true -stderr_events_enabled = true - +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 [program:awx-rsyslogd] command = rsyslogd -n -i /var/run/awx-rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf autorestart = true startsecs=0 stopasgroup=true killasgroup=true -stdout_events_enabled = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 stderr_events_enabled = true [program:awx-receptor] @@ -97,8 +113,10 @@ command = receptor --config /etc/receptor/receptor.conf autorestart = true stopasgroup=true killasgroup=true -stdout_events_enabled = true -stderr_events_enabled = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 [group:tower-processes] programs=awx-dispatcher,awx-receiver,awx-uwsgi,awx-daphne,awx-nginx,awx-wsrelay,awx-rsyslogd,awx-ws-heartbeat,awx-rsyslog-configurer,awx-cache-clear @@ -110,8 +128,10 @@ autostart = true autorestart = true stopasgroup=true killasgroup=true -stdout_events_enabled = true -stderr_events_enabled = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 [eventlistener:rsyslog-4xx-recovery] command=/awx_devel/tools/scripts/rsyslog-4xx-recovery @@ -119,8 +139,8 @@ buffer_size = 100 events=PROCESS_LOG_STDERR priority=0 autorestart=true -stdout_events_enabled = true -stderr_events_enabled = true +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 [unix_http_server] file=/var/run/supervisor/supervisor.sock