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

Use the same settings on each supervisor entry

Browse Source 
I didnt see a reason for the weird inconsistencies here.
This commit is contained in:
Shane McDonald
2022-03-24 18:08:50 -04:00
parent b04747676c
commit 0cbc802cf4
3 changed files with 62 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tools/ansible/roles/dockerfile/templates/supervisor.conf.j2
View File

@@ -12,9 +12,10 @@ directory = /awx_devel
{% else %} {% else %}
command = nginx -g "daemon off;" command = nginx -g "daemon off;"
{% endif %} {% endif %}
autostart = true
autorestart = true autorestart = true
stopwaitsecs = 5 startsecs = 30
stopasgroup=true
killasgroup=true
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr
@@ -31,12 +32,10 @@ environment =
command = /var/lib/awx/venv/awx/bin/uwsgi /etc/tower/uwsgi.ini command = /var/lib/awx/venv/awx/bin/uwsgi /etc/tower/uwsgi.ini
directory = /var/lib/awx directory = /var/lib/awx
{% endif %} {% endif %}
autostart = true
autorestart = true autorestart = true
stopwaitsecs = 15 startsecs = 30
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
stopsignal=KILL
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr
@@ -50,10 +49,8 @@ directory = /awx_devel
command = /var/lib/awx/venv/awx/bin/daphne -b 127.0.0.1 -p 8051 --websocket_timeout -1 awx.asgi:channel_layer command = /var/lib/awx/venv/awx/bin/daphne -b 127.0.0.1 -p 8051 --websocket_timeout -1 awx.asgi:channel_layer
directory = /var/lib/awx directory = /var/lib/awx
{% endif %} {% endif %}
autostart = true
stopsignal=KILL
autorestart = true autorestart = true
stopwaitsecs = 5 startsecs = 30
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
@@ -69,9 +66,8 @@ directory = /awx_devel
command = awx-manage run_wsbroadcast command = awx-manage run_wsbroadcast
directory = /var/lib/awx directory = /var/lib/awx
{% endif %} {% endif %}
autostart = true
autorestart = true autorestart = true
stopwaitsecs = 5 startsecs = 30
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
@@ -81,16 +77,14 @@ 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
autostart = true
autorestart = true autorestart = true
startretries = 10 startsecs = 30
stopwaitsecs = 5
stopsignal=TERM
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
redirect_stderr=true stdout_logfile=/dev/stdout
stdout_logfile=/dev/stderr
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[group:tower-processes] [group:tower-processes]
programs=nginx,uwsgi,daphne,wsbroadcast,awx-rsyslogd programs=nginx,uwsgi,daphne,wsbroadcast,awx-rsyslogd
@@ -98,11 +92,11 @@ priority=5
[eventlistener:superwatcher] [eventlistener:superwatcher]
command=stop-supervisor command=stop-supervisor
events=PROCESS_STATE_FATAL,PROCESS_STATE_EXITED events=PROCESS_STATE_FATAL
stderr_logfile=/dev/stdout
stderr_logfile_maxbytes=0
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[unix_http_server] [unix_http_server]
file=/var/run/supervisor/supervisor.web.sock file=/var/run/supervisor/supervisor.web.sock

13
tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2
View File

@@ -13,9 +13,8 @@ directory = /awx_devel
command = awx-manage run_dispatcher command = awx-manage run_dispatcher
directory = /var/lib/awx directory = /var/lib/awx
{% endif %} {% endif %}
autostart = true
autorestart = true autorestart = true
stopwaitsecs = 5 startsecs = 30
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
@@ -31,9 +30,8 @@ directory = /awx_devel
command = awx-manage run_callback_receiver command = awx-manage run_callback_receiver
directory = /var/lib/awx directory = /var/lib/awx
{% endif %} {% endif %}
autostart = true
autorestart = true autorestart = true
stopwaitsecs = 5 startsecs = 30
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
@@ -47,11 +45,12 @@ priority=5
[eventlistener:superwatcher] [eventlistener:superwatcher]
command=stop-supervisor command=stop-supervisor
events=PROCESS_STATE_FATAL,PROCESS_STATE_EXITED events=PROCESS_STATE_FATAL
stderr_logfile=/dev/stdout autorestart = true
stderr_logfile_maxbytes=0
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[unix_http_server] [unix_http_server]
file=/var/run/supervisor/supervisor.sock file=/var/run/supervisor/supervisor.sock

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

@@ -5,79 +5,75 @@ nodaemon=true
[program:awx-dispatcher] [program:awx-dispatcher]
command = make dispatcher command = make dispatcher
autostart = true
autorestart = true autorestart = true
stopwaitsecs = 1 startsecs = 30
stopsignal=KILL
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
redirect_stderr=true stdout_logfile=/dev/stdout
stdout_events_enabled = true stdout_logfile_maxbytes=0
stderr_events_enabled = true stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[program:awx-receiver] [program:awx-receiver]
command = make receiver command = make receiver
autostart = true
autorestart = true autorestart = true
stopwaitsecs = 1 startsecs = 30
stopsignal=KILL
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
redirect_stderr=true stdout_logfile=/dev/stdout
stdout_events_enabled = true stdout_logfile_maxbytes=0
stderr_events_enabled = true stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[program:awx-wsbroadcast] [program:awx-wsbroadcast]
command = make wsbroadcast command = make wsbroadcast
autostart = true
autorestart = true autorestart = true
stopwaitsecs = 1 startsecs = 30
stopsignal=KILL autorestart = true
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
redirect_stderr=true stdout_logfile=/dev/stdout
stdout_events_enabled = true stdout_logfile_maxbytes=0
stderr_events_enabled = true stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[program:awx-uwsgi] [program:awx-uwsgi]
command = make uwsgi command = make uwsgi
autostart = true
autorestart = true autorestart = true
redirect_stderr=true startsecs = 30
stopwaitsecs = 1
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
autostart = true
autorestart = true autorestart = true
redirect_stderr=true startsecs = 30
stopwaitsecs = 1
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-nginx] [program:awx-nginx]
command = make nginx command = make nginx
autostart = true
autorestart = true autorestart = true
redirect_stderr=true startsecs = 30
stdout_events_enabled = true stopasgroup=true
stderr_events_enabled = true killasgroup=true
stdout_logfile=/dev/stdout
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
autostart = true
autorestart = true autorestart = true
stopwaitsecs = 5 startsecs = 30
stopsignal=TERM
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
redirect_stderr=true redirect_stderr=true
@@ -86,14 +82,14 @@ stderr_events_enabled = true
[program:awx-receptor] [program:awx-receptor]
command = receptor --config /etc/receptor/receptor.conf command = receptor --config /etc/receptor/receptor.conf
autostart = true
autorestart = true autorestart = true
stopsignal = KILL startsecs = 30
stopasgroup = true stopasgroup=true
killasgroup = true killasgroup=true
redirect_stderr=true stdout_logfile=/dev/stdout
stdout_events_enabled = true stdout_logfile_maxbytes=0
stderr_events_enabled = true 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-wsbroadcast,awx-rsyslogd programs=awx-dispatcher,awx-receiver,awx-uwsgi,awx-daphne,awx-nginx,awx-wsbroadcast,awx-rsyslogd
@@ -101,7 +97,8 @@ priority=5
[eventlistener:superwatcher] [eventlistener:superwatcher]
command=stop-supervisor command=stop-supervisor
events=PROCESS_STATE_FATAL,PROCESS_STATE_EXITED events=PROCESS_STATE_FATAL
autorestart = true
stderr_logfile=/dev/stdout stderr_logfile=/dev/stdout
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout