From e368c1ba9bd881f8d054ea29fe2ef90a6e32ac75 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 30 Apr 2023 21:55:44 -0500
Subject: [PATCH] update

---
 defaults.inc        |  2 +-
 nodemgmt-scripts.sh | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 3ff595a8..a2075524 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='4.6.5-04302023'
+VERS='4.6.7-04302023'
 
 #NODETYPES=WEB,LB
 NODETYPES=MYSQL,LB,WEB,NC,WPD,LPD,MM,PW
diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index d1395f59..9a24028b 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -426,7 +426,8 @@ STATUS(){
 			echo -e "${idsCL[Yellow]} Replication Status Between the Primary and Secondary Nodes${idsCL[Default]}"
 			DIVIDER; echo -e "${idsST[Reset]}"
 		fi
-		echo "$(date) - START   - ${rcheck} -	$(SHOW_TIME $(expr `date +%s` - $replstart) s)" >> ${FOLDER}/log.repl
+		replcheckstart=`date +%s`
+		echo "$(date) - STARTING REPL CHECK -	$(SHOW_TIME $(expr `date +%s` - $replstart) s)" >> ${FOLDER}/log.repl
 		for NTYPE in "${NODE_TYPES[@]}"; do
 			PH=${NTYPE}_HOSTS[0]
 			PH_CMD="ssh root@${!PH}"
@@ -491,26 +492,27 @@ STATUS(){
 								done
 								replend=`date +%s`
 								replruntime=$((replend-replstart))
+								replcheckruntime=$((replend-replcheckstart))
 								if [ "${timeout}" = "true" ]; then
 									if [ "${ST_ACTION}" != "check" ]; then
-										echo -e "${idsCL[Red]}Timeout${idsCL[Default]} - timed out in $(SHOW_TIME ${replruntime} s)"
+										echo -e "${idsCL[Red]}Timeout${idsCL[Default]} - $(SHOW_TIME ${replruntime} s) since copy & $(SHOW_TIME ${replcheckruntime} s) since check"
 									fi
 									if [ ! -f ${FOLDER}/${nip}-${rcheck}.down ]; then
 										touch ${FOLDER}/${nip}-${rcheck}.down
 										SENDNOTICE "Repl-Timeout-'${NM_NODETYPES[$NTYPE]}-Node${nid}'" "${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})" 1
 										echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - (${REPL_DESC[${rcheck}]}) Replicated folder timeout, it is not syncing" >> ${LOGFILE}
 									fi
-									echo "$(date) - TIMEOUT - ${rcheck} -	$(SHOW_TIME ${replruntime} s)" >> ${FOLDER}/log.repl
+									echo "$(date) - TIMEOUT - ${rcheck} -	$(SHOW_TIME ${replruntime} s) since copy & $(SHOW_TIME ${replcheckruntime} s) since check" >> ${FOLDER}/log.repl
 								else
 									if [ "${ST_ACTION}" != "check" ]; then
-										echo -e "${idsCL[Green]}Good${idsCL[Default]} - synced in $(SHOW_TIME ${replruntime} s)"
+										echo -e "${idsCL[Green]}Good${idsCL[Default]} - $(SHOW_TIME ${replruntime} s) since copy & $(SHOW_TIME ${replcheckruntime} s) since check"
 									fi
 									if [ -f ${FOLDER}/${nip}-${rcheck}.down ]; then
 										rm -f ${FOLDER}/${nip}-${rcheck}.down
 										SENDNOTICE "Repl-Timeout-'${NM_NODETYPES[$NTYPE]}-Node${nid}'" "Replicated folder is back up!\n${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})"
 										echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - (${REPL_DESC[${rcheck}]}) Replicated folder is back up" >> ${LOGFILE}
 									fi
-									echo "$(date) - SYNCED  - ${rcheck} -	$(SHOW_TIME ${replruntime} s)" >> ${FOLDER}/log.repl
+									echo "$(date) - SYNCED  - ${rcheck} -	$(SHOW_TIME ${replruntime} s) since copy & $(SHOW_TIME ${replcheckruntime} s) since check" >> ${FOLDER}/log.repl
 								fi
 				
 							done