Rename tasks_healthy to tasks:healthy

This commit is contained in:
Tortue Torche 2019-08-10 22:18:46 -04:00 committed by Tortue Torche
parent 85ccf0c94b
commit 7dd1c16a8d

8
psu Executable file → Normal file
View File

@ -26,7 +26,7 @@ set -e
############################ ############################
main() { main() {
VERSION="0.2.0-alpha.2" VERSION="0.2.0-alpha.2"
ACTIONS="deploy undeploy list info services tasks tasks_healthy containers status help version" ACTIONS="deploy undeploy list info status services tasks tasks:healthy containers help version"
set_globals "$@" set_globals "$@"
@ -97,7 +97,7 @@ main() {
# Tasks should not have one of these states: # Tasks should not have one of these states:
# 'failed', 'orphaned', 'remove' # 'failed', 'orphaned', 'remove'
timeout -t $ROLLOUT_STATUS_TIMEOUT bash -c "until (export DEBUG_MODE=false && export VERBOSE_MODE=false && psu -a tasks_healthy -q) >/dev/null 2>&1; do echo -n \$(if [ \"\$VERBOSE_MODE\" == \"true\" ]; then echo -n .; fi) && sleep 1; done;" timeout -t $ROLLOUT_STATUS_TIMEOUT bash -c "until (export DEBUG_MODE=false && export VERBOSE_MODE=false && psu -a tasks:healthy -q) >/dev/null 2>&1; do echo -n \$(if [ \"\$VERBOSE_MODE\" == \"true\" ]; then echo -n .; fi) && sleep 1; done;"
status=$? status=$?
if $(exit $status); then if $(exit $status); then
@ -110,9 +110,9 @@ main() {
fi fi
fi fi
if [ $ACTION == "tasks" ] || [ $ACTION == "tasks_healthy" ]; then if [ $ACTION == "tasks" ] || [ $ACTION == "tasks:healthy" ]; then
local scope local scope
scope="$(if [ $ACTION == "tasks_healthy" ]; then echo healthy; else echo all; fi)" scope="$(if [ $ACTION == "tasks:healthy" ]; then echo healthy; else echo all; fi)"
local tasks local tasks
if [ -n "$PORTAINER_SERVICE_NAME" ]; then if [ -n "$PORTAINER_SERVICE_NAME" ]; then
echo_verbose "List $scope tasks from service '$PORTAINER_SERVICE_NAME' of stack '$PORTAINER_STACK_NAME'..." echo_verbose "List $scope tasks from service '$PORTAINER_SERVICE_NAME' of stack '$PORTAINER_STACK_NAME'..."