diff --git a/awx/main/utils/external_logging.py b/awx/main/utils/external_logging.py index a30003ef5d..bef6dac151 100644 --- a/awx/main/utils/external_logging.py +++ b/awx/main/utils/external_logging.py @@ -28,6 +28,7 @@ def reconfigure_rsyslog(): parts = [] parts.extend([ + '$IncludeConfig /etc/rsyslog.conf', '$ModLoad imudp', '$UDPServerRun 51414', 'template(name="awx" type="string" string="%msg%")', diff --git a/installer/roles/image_build/files/supervisor_task.conf b/installer/roles/image_build/files/supervisor_task.conf index a0100980b2..9acf19f7e9 100644 --- a/installer/roles/image_build/files/supervisor_task.conf +++ b/installer/roles/image_build/files/supervisor_task.conf @@ -26,8 +26,20 @@ stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 +[program:awx-rsyslogd] +command = rsyslogd -n -i /awx_devel/rsyslog.pid +autostart = true +autorestart = true +stopwaitsecs = 1 +stopsignal=KILL +stopasgroup=true +killasgroup=true +redirect_stderr=true +stdout_logfile=/dev/stderr +stdout_logfile_maxbytes=0 + [group:tower-processes] -programs=dispatcher,callback-receiver +programs=dispatcher,callback-receiver,awx-rsyslogd priority=5 # TODO: Exit Handler diff --git a/tools/docker-compose/supervisor.conf b/tools/docker-compose/supervisor.conf index 2a39e0fba6..f5416c4b26 100644 --- a/tools/docker-compose/supervisor.conf +++ b/tools/docker-compose/supervisor.conf @@ -72,7 +72,7 @@ stdout_logfile=/dev/fd/1 stdout_logfile_maxbytes=0 [program:awx-rsyslogd] -command = rsyslogd -nd -i /awx_devel/rsyslog.pid +command = rsyslogd -n -i /awx_devel/rsyslog.pid autostart = true autorestart = true stopwaitsecs = 1 @@ -80,7 +80,7 @@ stopsignal=KILL stopasgroup=true killasgroup=true redirect_stderr=true -stdout_logfile=/tmp/ryan +stdout_logfile=/dev/fd/1 stdout_logfile_maxbytes=0 [group:tower-processes]