Mirrored_Repos/psu
1
0
Fork 0
mirror of https://gitlab.com/psuapp/psu.git synced 2024-08-30 18:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename ROLLOUT_STATUS_TIMEOUT to TIMEOUT

Browse Source
This commit is contained in:
Tortue Torche 2019-08-10 22:50:50 -04:00 committed by Tortue Torche
parent 4c9b09dd51
commit 2a89465b90
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
psu
View File

@ -17,7 +17,7 @@ set -e
# PORTAINER_SERVICE_NAME # # PORTAINER_SERVICE_NAME #
# STACKS # # STACKS #
# STACK # # STACK #
# ROLLOUT_STATUS_TIMEOUT # # TIMEOUT #
# ACTION # # ACTION #
# Arguments: # # Arguments: #
# None # # None #
@ -123,7 +123,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 $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
@ -147,7 +147,7 @@ main() {
else else
echo_verbose "List $scope tasks of stack '$PORTAINER_STACK_NAME'..." echo_verbose "List $scope tasks of stack '$PORTAINER_STACK_NAME'..."
local services local services
services="$(timeout -t $ROLLOUT_STATUS_TIMEOUT bash -c "until (export DEBUG_MODE=false && export VERBOSE_MODE=false && echo \"\$(psu -a services -q)\"); do sleep 1; done;")" services="$(timeout -t $TIMEOUT bash -c "until (export DEBUG_MODE=false && export VERBOSE_MODE=false && echo \"\$(psu -a services -q)\"); do sleep 1; done;")"
# TODO: Improve performance, find a way to do parallel requests # TODO: Improve performance, find a way to do parallel requests
for service in $services; do for service in $services; do
export PORTAINER_SERVICE_NAME=${service#"${PORTAINER_STACK_NAME}_"} export PORTAINER_SERVICE_NAME=${service#"${PORTAINER_STACK_NAME}_"}
@ -240,7 +240,7 @@ main() {
# ENVIRONMENT_VARIABLES_FILE # # ENVIRONMENT_VARIABLES_FILE #
# PORTAINER_ENDPOINT # # PORTAINER_ENDPOINT #
# PORTAINER_PRUNE # # PORTAINER_PRUNE #
# ROLLOUT_STATUS_TIMEOUT # # TIMEOUT #
# AUTO_DETECT_JOB # # AUTO_DETECT_JOB #
# HTTPIE_VERIFY_SSL # # HTTPIE_VERIFY_SSL #
# VERBOSE_MODE # # VERBOSE_MODE #
@ -266,7 +266,7 @@ set_globals() {
ENVIRONMENT_VARIABLES_FILE=${ENVIRONMENT_VARIABLES_FILE} ENVIRONMENT_VARIABLES_FILE=${ENVIRONMENT_VARIABLES_FILE}
PORTAINER_ENDPOINT=${PORTAINER_ENDPOINT:-"1"} PORTAINER_ENDPOINT=${PORTAINER_ENDPOINT:-"1"}
PORTAINER_PRUNE=${PORTAINER_PRUNE:-"false"} PORTAINER_PRUNE=${PORTAINER_PRUNE:-"false"}
ROLLOUT_STATUS_TIMEOUT=${ROLLOUT_STATUS_TIMEOUT:-100} TIMEOUT=${TIMEOUT:-100}
AUTO_DETECT_JOB=${AUTO_DETECT_JOB:-"true"} AUTO_DETECT_JOB=${AUTO_DETECT_JOB:-"true"}
HTTPIE_VERIFY_SSL=${HTTPIE_VERIFY_SSL:-"yes"} HTTPIE_VERIFY_SSL=${HTTPIE_VERIFY_SSL:-"yes"}
VERBOSE_MODE=${VERBOSE_MODE:-"false"} VERBOSE_MODE=${VERBOSE_MODE:-"false"}
@ -288,7 +288,7 @@ set_globals() {
echo_debug "ENVIRONMENT_VARIABLES_FILE -> $ENVIRONMENT_VARIABLES_FILE" echo_debug "ENVIRONMENT_VARIABLES_FILE -> $ENVIRONMENT_VARIABLES_FILE"
echo_debug "PORTAINER_ENDPOINT -> $PORTAINER_ENDPOINT" echo_debug "PORTAINER_ENDPOINT -> $PORTAINER_ENDPOINT"
echo_debug "PORTAINER_PRUNE -> $PORTAINER_PRUNE" echo_debug "PORTAINER_PRUNE -> $PORTAINER_PRUNE"
echo_debug "ROLLOUT_STATUS_TIMEOUT -> $ROLLOUT_STATUS_TIMEOUT" echo_debug "TIMEOUT -> $TIMEOUT"
echo_debug "AUTO_DETECT_JOB -> $AUTO_DETECT_JOB" echo_debug "AUTO_DETECT_JOB -> $AUTO_DETECT_JOB"
echo_debug "HTTPIE_VERIFY_SSL -> $HTTPIE_VERIFY_SSL" echo_debug "HTTPIE_VERIFY_SSL -> $HTTPIE_VERIFY_SSL"
echo_debug "VERBOSE_MODE -> $VERBOSE_MODE" echo_debug "VERBOSE_MODE -> $VERBOSE_MODE"
@ -373,7 +373,7 @@ inputs() {
fi fi
;; ;;
-T=*|--timeout=*|-T|--timeout) -T=*|--timeout=*|-T|--timeout)
ROLLOUT_STATUS_TIMEOUT=$(input_option "$1" "$2") TIMEOUT=$(input_option "$1" "$2")
if [ -n "$2" ] && [[ ! $2 =~ ^-.+$ ]] ; then if [ -n "$2" ] && [[ ! $2 =~ ^-.+$ ]] ; then
# When the second argument is the value of the current option # When the second argument is the value of the current option
shift shift