Merge branch 'dev' into 'master' (55f91dbd) · Commits · REDMIC Project / Docker / Docker deploy

script/_check-deploy.sh

+8 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,8 @@ checkDeployCmd="\
		echo -e \"${FAIL_COLOR}Cannot find running service by name ${DATA_COLOR}\${serviceToCheck}${NULL_COLOR}\\n\" ; \
		fi ; \
		serviceIsRunning=\"[ 0 -ne 0 ]\" ; \
		success=\"\${success} 0\" ; \
		break ; \
		else \
		runningServiceCount=\$(echo \"\${serviceToCheckReplication}\" \| ${GREP_BIN} -cE '([0-9]+)\/\1') ; \
		serviceIsRunning=\"[ \${runningServiceCount} -eq 1 ]\" ; \
		@@ -77,6 +79,11 @@ checkDeployCmd="\
		success=\"\${success} 1\" ; \
		break ; \
		fi ; \
		if [ \"\${i}\" -eq \"${STATUS_CHECK_RETRIES}\" ] ; \
		then \
		success=\"\${success} 0\" ; \
		break ; \
		fi ; \
		else \
		echo -e \"${FAIL_COLOR}[FAIL]${NULL_COLOR}\" ; \
		if [ \"\${i}\" -eq \"${STATUS_CHECK_RETRIES}\" ] ; \
		@@ -84,6 +91,7 @@ checkDeployCmd="\
		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\" ; \
		break ; \
		fi ; \
		fi ; \
		sleep ${STATUS_CHECK_INTERVAL} ; \

+3 −1

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ STATUS_CHECK_DELAY="${STATUS_CHECK_DELAY:-120}"
		STATUS_CHECK_MIN_HITS="${STATUS_CHECK_MIN_HITS:-3}"

		GREP_BIN="${GREP_BIN:-grep}"
		SSH_CONTROL_PERSIST="${SSH_CONTROL_PERSIST:-10}"

		INFO_COLOR='\033[1;36m'
		DATA_COLOR='\033[1;33m'
		@@ -20,6 +21,7 @@ PASS_COLOR='\033[0;32m'
		NULL_COLOR='\033[0m'

		SSH_PARAMS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=error \
		-o "ControlPath=\"/ssh_connection_socket_%h_%p_%r\"" -o ControlMaster=auto -o ControlPersist=60"
		-o "ControlPath=\"/ssh_connection_socket_%h_%p_%r\"" -o ControlMaster=auto \
		-o ControlPersist=${SSH_CONTROL_PERSIST}"

		SCRIPTS_PATH="/usr/bin/"