From d8f9a1a4fa3f111294bd074ca4ec0dc8b8f2957e Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 16 Nov 2023 08:30:27 -0600 Subject: [PATCH] Update status.inc --- inc/status.inc | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/inc/status.inc b/inc/status.inc index 683adc9b..c6b6849a 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -25,16 +25,12 @@ STATUS(){ ntypesel=(${NM_NODE_TYPES[@]}) fi - for NTYPE in "${ntypesel[@]}"; do - echo "HERE: $NTYPE" - done - ######################## - if [ "${ST_ACTION}" == "report" ] || [ "${ST_ACTION}" == "repl" ] || [ "${ST_ACTION}" == "check" ] || [ "${ST_ACTION}" == "xx" ]; then + if [ "${ST_ACTION}" == "report" ] || [ "${ST_ACTION}" == "repl" ] || [ "${ST_ACTION}" == "check" ] || [ "${ST_ACTION}" == "" ]; then if [ "${ST_ACTION}" != "check" ]; then echo -en "${idsCL[LightCyan]}Setting up replication checks ... ${idsCL[Default]}" fi - for NTYPE in "${NM_NODE_TYPES[@]}"; do + for NTYPE in "${ntypesel[@]}"; do PH=${NTYPE}_HOSTS[0] if [ ! -f ${NM_FOLDER}/${!PH}.down ]; then PH_CMD="ssh root@${!PH}" @@ -133,7 +129,7 @@ STATUS(){ fi ######################## - for NTYPE in "${NM_NODE_TYPESsss[@]}"; do + for NTYPE in "${ntypesel[@]}"; do nid=1 dockers=${NTYPE}_DOCKERS_CHECK[@] @@ -490,7 +486,7 @@ STATUS(){ DIVIDER; echo -e "${idsST[Reset]}" echo -en " ${idsCL[LightCyan]}Starting processes to collect/monitor replication status : " fi - for NTYPE in "${NM_NODE_TYPES[@]}"; do + for NTYPE in "${ntypesel[@]}"; do PH=${NTYPE}_HOSTS[0] PH_CMD="ssh root@${!PH}" var=${NTYPE}_REPL_CHECK[@] @@ -510,7 +506,7 @@ STATUS(){ done [ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Green]}Done${idsCL[Default]}\n" - for NTYPE in "${NM_NODE_TYPES[@]}"; do + for NTYPE in "${ntypesel[@]}"; do PH=${NTYPE}_HOSTS[0] PH_CMD="ssh root@${!PH}" var=${NTYPE}_REPL_CHECK[@] @@ -599,7 +595,7 @@ It was down for $(SHOW_TIME ${toterrtime})" #NHCMD="ssh root@${NM_HOSTS['MYSQL'][0]}" #LBHCMD="ssh root@${NM_HOSTS['LB'][0]}" #WHCMD="ssh root@${NM_HOSTS['WEB'][0]}" - for NTYPE in "${NM_NODE_TYPES[@]}"; do + for NTYPE in "${ntypesel[@]}"; do PH=${NTYPE}_HOSTS[0] if [ ! -f ${NM_FOLDER}/${!PH}.down ]; then PH_CMD="ssh root@${!PH}" @@ -634,7 +630,7 @@ It was down for $(SHOW_TIME ${toterrtime})" #if [ "${ST_ACTION}" = "" ] || [ "${ST_ACTION}" = "report" ] || [ "${ST_ACTION}" = "freespace" ]; then if [ "${ST_ACTION}" = "freespace" ]; then if [ "${ST_ACTION}" != "repl" ] && [ "${ST_ACTION}" != "services" ]; then - for NTYPE in "${NM_NODE_TYPES[@]}"; do + for NTYPE in "${ntypesel[@]}"; do if [ "${ST_ACTION}" != "check" ]; then echo -e "${idsST[Bold]}"; DIVIDER echo -e "${idsCL[Yellow]} ${NM_NODETYPES[$NTYPE]}-Node(s) Free Space Scan${idsCL[Default]}"