summaryrefslogtreecommitdiffstats
path: root/tools/docker-compose
diff options
context:
space:
mode:
authorShane McDonald <me@shanemcd.com>2022-03-24 23:08:50 +0100
committerShane McDonald <me@shanemcd.com>2022-03-29 20:07:54 +0200
commit0cbc802cf4102eefc96397b77d0f6430d60c73a0 (patch)
tree99e07e0f3fc936362867af7bfc96e8d5d9b8ac2a /tools/docker-compose
parentProvision the instance before booting anything (diff)
downloadawx-0cbc802cf4102eefc96397b77d0f6430d60c73a0.tar.xz
awx-0cbc802cf4102eefc96397b77d0f6430d60c73a0.zip
Use the same settings on each supervisor entry
I didnt see a reason for the weird inconsistencies here.
Diffstat (limited to 'tools/docker-compose')
-rw-r--r--tools/docker-compose/supervisor.conf89
1 files changed, 43 insertions, 46 deletions
diff --git a/tools/docker-compose/supervisor.conf b/tools/docker-compose/supervisor.conf
index 618197696c..0726c083fa 100644
--- a/tools/docker-compose/supervisor.conf
+++ b/tools/docker-compose/supervisor.conf
@@ -5,79 +5,75 @@ nodaemon=true
[program:awx-dispatcher]
command = make dispatcher
-autostart = true
autorestart = true
-stopwaitsecs = 1
-stopsignal=KILL
+startsecs = 30
stopasgroup=true
killasgroup=true
-redirect_stderr=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 = make receiver
-autostart = true
autorestart = true
-stopwaitsecs = 1
-stopsignal=KILL
+startsecs = 30
stopasgroup=true
killasgroup=true
-redirect_stderr=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-wsbroadcast]
command = make wsbroadcast
-autostart = true
autorestart = true
-stopwaitsecs = 1
-stopsignal=KILL
+startsecs = 30
+autorestart = true
stopasgroup=true
killasgroup=true
-redirect_stderr=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-uwsgi]
command = make uwsgi
-autostart = true
autorestart = true
-redirect_stderr=true
-stopwaitsecs = 1
-stopsignal=KILL
+startsecs = 30
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
-autostart = true
autorestart = true
-redirect_stderr=true
-stopwaitsecs = 1
-stopsignal=KILL
+startsecs = 30
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
-autostart = true
autorestart = true
-redirect_stderr=true
-stdout_events_enabled = true
-stderr_events_enabled = true
+startsecs = 30
+stopasgroup=true
+killasgroup=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
-autostart = true
autorestart = true
-stopwaitsecs = 5
-stopsignal=TERM
+startsecs = 30
stopasgroup=true
killasgroup=true
redirect_stderr=true
@@ -86,14 +82,14 @@ stderr_events_enabled = true
[program:awx-receptor]
command = receptor --config /etc/receptor/receptor.conf
-autostart = true
autorestart = true
-stopsignal = KILL
-stopasgroup = true
-killasgroup = true
-redirect_stderr=true
-stdout_events_enabled = true
-stderr_events_enabled = true
+startsecs = 30
+stopasgroup=true
+killasgroup=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-wsbroadcast,awx-rsyslogd
@@ -101,7 +97,8 @@ priority=5
[eventlistener:superwatcher]
command=stop-supervisor
-events=PROCESS_STATE_FATAL,PROCESS_STATE_EXITED
+events=PROCESS_STATE_FATAL
+autorestart = true
stderr_logfile=/dev/stdout
stderr_logfile_maxbytes=0
stdout_logfile=/dev/stdout