From 15d2170eda426465c6f03ee61125ac9e427f6227 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 6 Mar 2019 13:17:43 -0600
Subject: [PATCH] Update nodemgmt-scripts.sh

---
 nodemgmt-scripts.sh | 124 ++++++++++++++++++++++----------------------
 1 file changed, 63 insertions(+), 61 deletions(-)

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 60c5a26b..9d79334d 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -319,71 +319,73 @@ STATUS(){
 			echo -e "${idsCL[Yellow]} Replication Status Between the Primary and Secondary Nodes${idsCL[Default]}"
 			DIVIDER; echo -e "${idsST[Reset]}"
 		fi
-		nid=1
-		for nip in "${NODE_HOSTS[@]}"; do
-			if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]] && [ "${nip}" = "${NODE_HOSTS[0]}" ]; then
-				if [ "${ST_ACTION}" != "check" ]; then
-					echo -e " ${idsCL[LightCyan]}MySQL-Node1 (${NODE_HOSTS[0]}) <--> ${idsST[Bold]}MySQL-Node${nid} (${nip})${idsST[Reset]}${idsCL[Default]}"
-					DIVIDER false green
-				fi
-				checkhost=$(CHECK_HOST ${nip})
-				if [ "${checkhost}" != "false" ]; then
-					if [ -f ${FOLDER}/${nip}.down ]; then
-						rm -f ${FOLDER}/${nip}.down
-						if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "MySQL-Node${nid} is back UP!" | mail -s "MySQL-Node${nid}-${nip}-UP" ${STATUS_CHECK_EMAIL}; fi
-					fi
-					for rcheck in "${NODE_REPL_CHECK[@]}"; do
-						if [ "${ST_ACTION}" != "check" ]; then
-							c=0; cw=22; spc=''
-							spc1=${cw}-${#REPL_DESC[${rcheck}]}
-							timeout=`date --date='20 seconds' +%s`
-							until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
-							echo -en " ${REPL_DESC[${rcheck}]}${spc}: "
-						fi
-						checked=false
-						until [ "${checked}" = "" ]; do
-							if [ "${NHCMD}" = "" ]; then
-								checked=`ssh root@${nip} "cat ${REPL_CHECKS[${rcheck}]}/test.repl" | diff - ${REPL_CHECKS[${rcheck}]}/test.repl`
-							else
-								checked="`${NHCMD} \"ssh root@${nip} \"cat ${REPL_CHECKS[${rcheck}]}/test.repl\" | diff - ${REPL_CHECKS[${rcheck}]}/test.repl\"`"
-							fi
-							if [ "`date +%s`" -gt "$timeout" ]; then
-								timeout=true
-								break
-							fi
-						done
-						if [ "${timeout}" = "true" ]; then
-							if [ "${ST_ACTION}" != "check" ]; then
-								echo -e "${idsCL[Red]}Timeout${idsCL[Default]}"
-							fi
-							if [ ! -f ${FOLDER}/${nip}-${rcheck}.down ]; then
-								touch ${FOLDER}/${nip}-${rcheck}.down
-								if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})" | mail -s "Repl-Timeout-'MySQL-Node${nid}'" ${STATUS_CHECK_EMAIL}; fi
-							fi
-						else
-							if [ "${ST_ACTION}" != "check" ]; then
-								echo -e "${idsCL[Green]}Good${idsCL[Default]}"
-							fi
-							if [ -f ${FOLDER}/${nip}-${rcheck}.down ]; then
-								rm -f ${FOLDER}/${nip}-${rcheck}.down
-								if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "Replicated folder is back up!\n${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})" | mail -s "Repl-Timeout-'MySQL-Node${nid}'" ${STATUS_CHECK_EMAIL}; fi
-							fi
-						fi
-						
-					done
-				else
+		if [ -z ${NODE_REPL_CHECK+x} ]; then
+			nid=1
+			for nip in "${NODE_HOSTS[@]}"; do
+				if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]] && [ "${nip}" = "${NODE_HOSTS[0]}" ]; then
 					if [ "${ST_ACTION}" != "check" ]; then
-						echo -e "${idsCL[Red]}Node is Down!${idsCL[Default]}"
+						echo -e " ${idsCL[LightCyan]}MySQL-Node1 (${NODE_HOSTS[0]}) <--> ${idsST[Bold]}MySQL-Node${nid} (${nip})${idsST[Reset]}${idsCL[Default]}"
+						DIVIDER false green
 					fi
-					if [ ! -f ${FOLDER}/${nip}.down ]; then
-						touch ${FOLDER}/${nip}.down
-						if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "MySQL-Node${nid} is down" | mail -s "MySQL-Node${nid}-${nip}-DOWN" ${STATUS_CHECK_EMAIL}; fi
+					checkhost=$(CHECK_HOST ${nip})
+					if [ "${checkhost}" != "false" ]; then
+						if [ -f ${FOLDER}/${nip}.down ]; then
+							rm -f ${FOLDER}/${nip}.down
+							if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "MySQL-Node${nid} is back UP!" | mail -s "MySQL-Node${nid}-${nip}-UP" ${STATUS_CHECK_EMAIL}; fi
+						fi
+						for rcheck in "${NODE_REPL_CHECK[@]}"; do
+							if [ "${ST_ACTION}" != "check" ]; then
+								c=0; cw=22; spc=''
+								spc1=${cw}-${#REPL_DESC[${rcheck}]}
+								timeout=`date --date='20 seconds' +%s`
+								until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
+								echo -en " ${REPL_DESC[${rcheck}]}${spc}: "
+							fi
+							checked=false
+							until [ "${checked}" = "" ]; do
+								if [ "${NHCMD}" = "" ]; then
+									checked=`ssh root@${nip} "cat ${REPL_CHECKS[${rcheck}]}/test.repl" | diff - ${REPL_CHECKS[${rcheck}]}/test.repl`
+								else
+									checked="`${NHCMD} \"ssh root@${nip} \"cat ${REPL_CHECKS[${rcheck}]}/test.repl\" | diff - ${REPL_CHECKS[${rcheck}]}/test.repl\"`"
+								fi
+								if [ "`date +%s`" -gt "$timeout" ]; then
+									timeout=true
+									break
+								fi
+							done
+							if [ "${timeout}" = "true" ]; then
+								if [ "${ST_ACTION}" != "check" ]; then
+									echo -e "${idsCL[Red]}Timeout${idsCL[Default]}"
+								fi
+								if [ ! -f ${FOLDER}/${nip}-${rcheck}.down ]; then
+									touch ${FOLDER}/${nip}-${rcheck}.down
+									if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})" | mail -s "Repl-Timeout-'MySQL-Node${nid}'" ${STATUS_CHECK_EMAIL}; fi
+								fi
+							else
+								if [ "${ST_ACTION}" != "check" ]; then
+									echo -e "${idsCL[Green]}Good${idsCL[Default]}"
+								fi
+								if [ -f ${FOLDER}/${nip}-${rcheck}.down ]; then
+									rm -f ${FOLDER}/${nip}-${rcheck}.down
+									if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "Replicated folder is back up!\n${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})" | mail -s "Repl-Timeout-'MySQL-Node${nid}'" ${STATUS_CHECK_EMAIL}; fi
+								fi
+							fi
+						
+						done
+					else
+						if [ "${ST_ACTION}" != "check" ]; then
+							echo -e "${idsCL[Red]}Node is Down!${idsCL[Default]}"
+						fi
+						if [ ! -f ${FOLDER}/${nip}.down ]; then
+							touch ${FOLDER}/${nip}.down
+							if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "MySQL-Node${nid} is down" | mail -s "MySQL-Node${nid}-${nip}-DOWN" ${STATUS_CHECK_EMAIL}; fi
+						fi
 					fi
+					if [ "${ST_ACTION}" != "check" ]; then echo; fi
 				fi
-				if [ "${ST_ACTION}" != "check" ]; then echo; fi
-			fi
-			nid=`expr $nid + 1`
-		done
+				nid=`expr $nid + 1`
+			done
+		fi
 		nid=1
 		for nip in "${WEB_HOSTS[@]}"; do
 			if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]] && [ "${nip}" = "${WEB_HOSTS[0]}" ]; then