From 803857c4b5b0a426d72816ccb114abf13db98b70 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 30 Apr 2023 22:10:28 -0500
Subject: [PATCH] update

---
 defaults.inc   |  2 +-
 inc/status.inc | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 531c144a..24b6653e 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='4.6.10-04302023'
+VERS='4.6.11-04302023'
 
 #NODETYPES=WEB,LB
 NODETYPES=MYSQL,LB,WEB,NC,WPD,LPD,MM,PW
diff --git a/inc/status.inc b/inc/status.inc
index baa6f19e..f9bb8a37 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -463,6 +463,7 @@ STATUS(){
 								warn_timeout=`date --date='30 secs' +%s`
 								
 								checked=false
+								replnodestart=`date +%s`
 								until [ "${checked}" = "" ]; do
 									if [ "${PH_CMD}" = "" ]; then
 										ssh -q root@${nip} [[ -f ${REPL_CHECKS[${rcheck}]}/test.repl ]] && checked=`ssh root@${nip} "cat ${REPL_CHECKS[${rcheck}]}/test.repl" | diff - ${REPL_CHECKS[${rcheck}]}/test.repl`
@@ -479,27 +480,29 @@ STATUS(){
 								done
 								replend=`date +%s`
 								replruntime=$((replend-replstart))
+								replnoderuntime=$((replend-replnodestart))
 								replcheckruntime=$((replend-replcheckstart))
+								rrmsg="$(SHOW_TIME ${replruntime} s) since copy, $(SHOW_TIME ${replcheckruntime} s) since check start & $(SHOW_TIME ${replnoderuntime} s) since node check"
 								if [ "${timeout}" = "true" ]; then
 									if [ "${ST_ACTION}" != "check" ]; then
-										echo -e "${idsCL[Red]}Timeout${idsCL[Default]} - $(SHOW_TIME ${replruntime} s) since copy & $(SHOW_TIME ${replcheckruntime} s) since check"
+										echo -e "${idsCL[Red]}Timeout${idsCL[Default]} - ${rrmsg}"
 									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) since copy & $(SHOW_TIME ${replcheckruntime} s) since check" >> ${FOLDER}/log.repl
+									echo "$(date) - TIMEOUT - ${rcheck} -	${rrmsg}" >> ${FOLDER}/log.repl
 								else
 									if [ "${ST_ACTION}" != "check" ]; then
-										echo -e "${idsCL[Green]}Good${idsCL[Default]} - $(SHOW_TIME ${replruntime} s) since copy & $(SHOW_TIME ${replcheckruntime} s) since check"
+										echo -e "${idsCL[Green]}Good${idsCL[Default]} - ${rrmsg}"
 									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) since copy & $(SHOW_TIME ${replcheckruntime} s) since check" >> ${FOLDER}/log.repl
+									echo "$(date) - SYNCED  - ${rcheck} -	${rrmsg}" >> ${FOLDER}/log.repl
 								fi
 				
 							done