External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-23 11:55:04 -02:30
Code Issues Packages Projects Releases Wiki Activity

Correct misuse of stdxxx_event_enabled

Browse Source 
Not every log messages need to be emitted as a event!
This commit is contained in:
Hao Liu
2023-12-11 16:31:54 -05:00
committed by Hao Liu
parent 6e5e1c8fff
commit b5f6aac3aa
2 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/ansible/roles/dockerfile/templates/supervisor_rsyslog.conf.j2
View File

@@ -15,6 +15,7 @@ stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0
stderr_events_enabled = true
[program:awx-rsyslog-configurer] [program:awx-rsyslog-configurer]
{% if kube_dev | bool %} {% if kube_dev | bool %}
@@ -65,8 +66,8 @@ buffer_size = 100
events=PROCESS_LOG_STDERR events=PROCESS_LOG_STDERR
priority=0 priority=0
autorestart=true autorestart=true
stdout_events_enabled = true stderr_logfile=/dev/stderr
stderr_events_enabled = true stderr_logfile_maxbytes=0
[unix_http_server] [unix_http_server]
file=/var/run/supervisor/supervisor.rsyslog.sock file=/var/run/supervisor/supervisor.rsyslog.sock

64
tools/docker-compose/supervisor.conf
View File

@@ -8,16 +8,20 @@ command = awx-manage run_dispatcher
autorestart = true autorestart = true
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
stdout_events_enabled = true stdout_logfile=/dev/stdout
stderr_events_enabled = true stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[program:awx-receiver] [program:awx-receiver]
command = awx-manage run_callback_receiver command = awx-manage run_callback_receiver
autorestart = true autorestart = true
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
stdout_events_enabled = true stdout_logfile=/dev/stdout
stderr_events_enabled = true stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[program:awx-wsrelay] [program:awx-wsrelay]
command = awx-manage run_wsrelay command = awx-manage run_wsrelay
@@ -25,8 +29,10 @@ autorestart = true
autorestart = true autorestart = true
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
stdout_events_enabled = true stdout_logfile=/dev/stdout
stderr_events_enabled = true stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[program:awx-ws-heartbeat] [program:awx-ws-heartbeat]
command = awx-manage run_ws_heartbeat command = awx-manage run_ws_heartbeat
@@ -34,8 +40,10 @@ autorestart = true
autorestart = true autorestart = true
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
stdout_events_enabled = true stdout_logfile=/dev/stdout
stderr_events_enabled = true stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[program:awx-rsyslog-configurer] [program:awx-rsyslog-configurer]
command = awx-manage run_rsyslog_configurer command = awx-manage run_rsyslog_configurer
@@ -64,32 +72,40 @@ stopwaitsecs = 1
stopsignal=KILL stopsignal=KILL
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
stdout_events_enabled = true stdout_logfile=/dev/stdout
stderr_events_enabled = true stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[program:awx-daphne] [program:awx-daphne]
command = make daphne command = make daphne
autorestart = true autorestart = true
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
stdout_events_enabled = true stdout_logfile=/dev/stdout
stderr_events_enabled = true stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[program:awx-nginx] [program:awx-nginx]
command = make nginx command = make nginx
autorestart = true autorestart = true
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
stdout_events_enabled = true stdout_logfile=/dev/stdout
stderr_events_enabled = true stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[program:awx-rsyslogd] [program:awx-rsyslogd]
command = rsyslogd -n -i /var/run/awx-rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf command = rsyslogd -n -i /var/run/awx-rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf
autorestart = true autorestart = true
startsecs=0 startsecs=0
stopasgroup=true stopasgroup=true
killasgroup=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 stderr_events_enabled = true
[program:awx-receptor] [program:awx-receptor]
@@ -97,8 +113,10 @@ command = receptor --config /etc/receptor/receptor.conf
autorestart = true autorestart = true
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
stdout_events_enabled = true stdout_logfile=/dev/stdout
stderr_events_enabled = true stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[group:tower-processes] [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 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 autorestart = true
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
stdout_events_enabled = true stdout_logfile=/dev/stdout
stderr_events_enabled = true stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[eventlistener:rsyslog-4xx-recovery] [eventlistener:rsyslog-4xx-recovery]
command=/awx_devel/tools/scripts/rsyslog-4xx-recovery command=/awx_devel/tools/scripts/rsyslog-4xx-recovery
@@ -119,8 +139,8 @@ buffer_size = 100
events=PROCESS_LOG_STDERR events=PROCESS_LOG_STDERR
priority=0 priority=0
autorestart=true autorestart=true
stdout_events_enabled = true stderr_logfile=/dev/stderr
stderr_events_enabled = true stderr_logfile_maxbytes=0
[unix_http_server] [unix_http_server]
file=/var/run/supervisor/supervisor.sock file=/var/run/supervisor/supervisor.sock