Commit 72e12ac1 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Revisa y corrige lógica de check deploy

parent 6c33949c
Loading
Loading
Loading
Loading
+34 −22
Original line number Diff line number Diff line
@@ -24,6 +24,14 @@ checkDeployCmd="\
					echo -e \"${FAIL_COLOR}Found ${DATA_COLOR}\${serviceCount}${FAIL_COLOR} services filtering by name ${DATA_COLOR}\${serviceToCheck}${FAIL_COLOR},${NULL_COLOR}\" ; \
					echo -e \"  ${FAIL_COLOR}will check only the service exactly named ${DATA_COLOR}\${runningServiceName}${NULL_COLOR}\\n\" ; \
				fi ; \
				if [ \${serviceCount} -eq 0 ] ; \
				then \
					if [ \${i} -eq 1 ] ; \
					then \
						echo -e \"${FAIL_COLOR}Cannot find running service by name ${DATA_COLOR}\${serviceToCheck}${NULL_COLOR}\\n\" ; \
					fi ; \
					serviceIsRunning=\"[ 0 -ne 0 ]\" ; \
				else \
					runningServiceCount=\$(echo \"\${serviceToCheckReplication}\" | ${GREP_BIN} -cE '([0-9]+)\/\1') ; \
					serviceIsRunning=\"[ \${runningServiceCount} -eq 1 ]\" ; \
					if ! \${serviceIsRunning} ; \
@@ -45,6 +53,7 @@ checkDeployCmd="\
							serviceIsRunning=true ; \
						fi ; \
					fi ; \
				fi ; \
				statusCheckCmd=\${serviceIsRunning} ; \
			else \
				runningContainersIds=\$(docker ps -f status=running --format '{{.ID}}' --no-trunc) ; \
@@ -63,19 +72,22 @@ checkDeployCmd="\
				hits=\$((\${hits} + 1)) && \
				if [ \"\${hits}\" -eq \"${STATUS_CHECK_MIN_HITS}\" ] ; \
				then \
					echo -e \"${PASS_COLOR}Service ${DATA_COLOR}\${serviceToCheck}${PASS_COLOR} is running!${NULL_COLOR}\" && \
					echo -e \"\\n${PASS_COLOR}Service ${DATA_COLOR}\${serviceToCheck}${PASS_COLOR} is running!${NULL_COLOR}\" && \
					echo -e \"  got ${PASS_COLOR}\${hits}/${STATUS_CHECK_MIN_HITS}${NULL_COLOR} status hits\" && \
					success=\"\${success} 1\" ; \
					break ; \
				fi ; \
			else \
				echo -e \"${FAIL_COLOR}[FAIL]${NULL_COLOR}\" ; \
				if [ \"\${i}\" -eq \"${STATUS_CHECK_RETRIES}\" ] ; \
				then \
					echo -e \"\\n${FAIL_COLOR}Service ${DATA_COLOR}\${serviceToCheck}${FAIL_COLOR} is not running!${NULL_COLOR}\" && \
					echo -e \"  got ${FAIL_COLOR}\${hits}/${STATUS_CHECK_MIN_HITS}${NULL_COLOR} status hits\" && \
					success=\"\${success} 0\" ; \
				fi ; \
			fi ; \
			sleep ${STATUS_CHECK_INTERVAL} ; \
		done ; \
		echo -e \"${FAIL_COLOR}Service ${DATA_COLOR}\${serviceToCheck}${FAIL_COLOR} is not running!${NULL_COLOR}\" && \
		echo -e \"  got ${FAIL_COLOR}\${hits}/${STATUS_CHECK_MIN_HITS}${NULL_COLOR} status hits\" && \
		success=\"\${success} 0\" ; \
	done ; \
	for serviceSuccess in \${success[*]} ; \
	do \
@@ -87,9 +99,9 @@ checkDeployCmd="\

if ssh ${SSH_PARAMS} "${SSH_REMOTE}" "${checkDeployCmd}"
then
	echo -e "${PASS_COLOR}All services seems ok!${NULL_COLOR}"
	echo -e "\\n${PASS_COLOR}All services seems ok!${NULL_COLOR}"
else
	echo -e "${FAIL_COLOR}One or more services seems failed!${NULL_COLOR}"
	echo -e "\\n${FAIL_COLOR}One or more services seems failed!${NULL_COLOR}"
	ssh ${SSH_PARAMS} -q -O exit "${SSH_REMOTE}"
	exit 1
fi