Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

In development environment not auto-reload explicitly STOPPED processes #14958

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -216,16 +216,14 @@ collectstatic:
fi; \
$(PYTHON) manage.py collectstatic --clear --noinput > /dev/null 2>&1

DEV_RELOAD_COMMAND ?= supervisorctl restart tower-processes:*

uwsgi: collectstatic
@if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/awx/bin/activate; \
fi; \
uwsgi /etc/tower/uwsgi.ini

awx-autoreload:
@/awx_devel/tools/docker-compose/awx-autoreload /awx_devel/awx "$(DEV_RELOAD_COMMAND)"
@/awx_devel/tools/docker-compose/awx-autoreload /awx_devel/awx

daphne:
@if [ "$(VENV_BASE)" ]; then \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ 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:*'
command = /awx_devel/tools/docker-compose/awx-autoreload /awx_devel/awx
autostart = true
autorestart = true
stopasgroup=true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ 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:*'
command = /awx_devel/tools/docker-compose/awx-autoreload /awx_devel/awx
autostart = true
autorestart = true
stopasgroup=true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ 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:*'
command = /awx_devel/tools/docker-compose/awx-autoreload /awx_devel/awx
autostart = true
autorestart = true
stopasgroup=true
Expand Down
11 changes: 9 additions & 2 deletions tools/docker-compose/awx-autoreload
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,15 @@ inotifywait -mrq -e create,delete,attrib,close_write,move --exclude '(/awx_devel
since_last=$((this_reload-last_reload))
if [[ "$file" =~ ^[^.].*\.py$ ]] && [[ "$since_last" -gt 1 ]]; then
echo "File changed: $file"
echo "Running command: $2"
eval $2
# if SUPERVISOR_CONFIG_PATH is defined run `supervisorctl -c $SUPERVISOR_CONFIG_PATH` else just run `supervisorctl`
if [ -n "$SUPERVISOR_CONFIG_PATH" ]; then
supervisorctl_command="supervisorctl -c $SUPERVISOR_CONFIG_PATH"
else
supervisorctl_command="supervisorctl"
fi
tower_processes=`$supervisorctl_command status tower-processes:* | grep -v STOPPED | awk '{print $1}' | tr '\n' ' '`
echo echo "Running command: $supervisorctl_command restart $tower_processes"
eval $supervisorctl_command restart $tower_processes
last_reload=`date +%s`
fi
done
Loading