From cfbbc4cb92a9ce637b9f632f46cbb312bd0b3fbc Mon Sep 17 00:00:00 2001 From: Hao Liu Date: Thu, 13 Apr 2023 14:43:06 -0400 Subject: [PATCH] Auto reload services in kube dev env --- .../templates/supervisor_rsyslog.conf.j2 | 13 +++++++++++++ .../dockerfile/templates/supervisor_task.conf.j2 | 13 +++++++++++++ .../dockerfile/templates/supervisor_web.conf.j2 | 15 +++++++++++++-- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/tools/ansible/roles/dockerfile/templates/supervisor_rsyslog.conf.j2 b/tools/ansible/roles/dockerfile/templates/supervisor_rsyslog.conf.j2 index f225b935c512..265b84dca463 100644 --- a/tools/ansible/roles/dockerfile/templates/supervisor_rsyslog.conf.j2 +++ b/tools/ansible/roles/dockerfile/templates/supervisor_rsyslog.conf.j2 @@ -33,6 +33,19 @@ stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 +{% if kube_dev | bool %} +[program:awx-autoreload] +command = /awx_devel/tools/docker-compose/awx-autoreload /awx_devel/awx 'supervisorctl -c /etc/supervisord_rsyslog.conf restart tower-processes:*' +autostart = true +autorestart = true +stopasgroup=true +killasgroup=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 +{% endif %} + [group:tower-processes] programs=awx-rsyslog-configurer,awx-rsyslogd priority=5 diff --git a/tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2 b/tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2 index 9d14a456217d..bce0a8752a02 100644 --- a/tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2 +++ b/tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2 @@ -56,6 +56,19 @@ stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 +{% if kube_dev | bool %} +[program:awx-autoreload] +command = /awx_devel/tools/docker-compose/awx-autoreload /awx_devel/awx 'supervisorctl -c /etc/supervisord_task.conf restart tower-processes:*' +autostart = true +autorestart = true +stopasgroup=true +killasgroup=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 +{% endif %} + [group:tower-processes] programs=dispatcher,callback-receiver,wsrelay priority=5 diff --git a/tools/ansible/roles/dockerfile/templates/supervisor_web.conf.j2 b/tools/ansible/roles/dockerfile/templates/supervisor_web.conf.j2 index a7528625372a..fcd32efc0d26 100644 --- a/tools/ansible/roles/dockerfile/templates/supervisor_web.conf.j2 +++ b/tools/ansible/roles/dockerfile/templates/supervisor_web.conf.j2 @@ -25,8 +25,6 @@ stderr_logfile_maxbytes=0 {% if kube_dev | bool %} command = make uwsgi directory = /awx_devel -environment = - DEV_RELOAD_COMMAND='supervisorctl -c /etc/supervisord_task.conf restart all; supervisorctl restart tower-processes:daphne' {% else %} command = /var/lib/awx/venv/awx/bin/uwsgi /etc/tower/uwsgi.ini directory = /var/lib/awx @@ -91,6 +89,19 @@ stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 +{% if kube_dev | bool %} +[program:awx-autoreload] +command = /awx_devel/tools/docker-compose/awx-autoreload /awx_devel/awx 'supervisorctl -c /etc/supervisord_web.conf restart tower-processes:*' +autostart = true +autorestart = true +stopasgroup=true +killasgroup=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 +{% endif %} + [group:tower-processes] programs=nginx,uwsgi,daphne,awx-cache-clear,heartbeet priority=5