From 847e87751027bbefc6c243a4a6a76c5986b5655c Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 11 Sep 2023 21:41:41 -0500 Subject: [PATCH] Update status.inc --- inc/status.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/inc/status.inc b/inc/status.inc index 85feca1c..d6aee071 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -502,30 +502,30 @@ STATUS(){ [ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Red]}Timeout${idsCL[Default]}" if [ ! -f ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down ]; then touch ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down - elif [ ! -f ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.errtime ]; then - cp ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.errtime + mv ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.errtime + touch ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down SENDNOTICE "Repl-Timeout-'${NM_HOSTNAMES[${nip}]}[${nip}]'" "${NM_REPL_DESC[${rcheck}]} (${NM_REPL_CHECK_LOC[${rcheck}]})" 1 echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - (${NM_REPL_DESC[${rcheck}]}) Replicated folder timeout, it is not syncing" >> ${NM_LOGFILE} - else snderrtime=`date +%s`-$(stat -c %Y ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down) - toterrtime=`date +%s`-$(stat -c %Y ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.errtime) if [ ${snderrtime} -gt 10 ]; then + toterrtime=`date +%s`-$(stat -c %Y ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.errtime) SENDNOTICE "Repl-Timeout-'${NM_HOSTNAMES[${nip}]}[${nip}]'" "${NM_REPL_DESC[${rcheck}]} (${NM_REPL_CHECK_LOC[${rcheck}]}) - Has been down for: $(SHOW_TIME ${toterrtime})" 1 +Has been down for: $(SHOW_TIME ${toterrtime})" 1 echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - (${NM_REPL_DESC[${rcheck}]}) Replicated folder timeout, has now been down for: $(SHOW_TIME ${toterrtime})" >> ${NM_LOGFILE} - touch ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down fi fi - else + elif [ "${checked}" == "good" ]; then [ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Green]}Good${idsCL[Default]}" if [ -f ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down ]; then rm -f ${NM_TMPFOLDER}/${nip}~${rcheck}.repl* - SENDNOTICE "Repl-Timeout-'${NM_HOSTNAMES[${nip}]}[${nip}]'" "Replicated folder is back up!\n${NM_REPL_DESC[${rcheck}]} (${NM_REPL_CHECK_LOC[${rcheck}]})" - echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - (${NM_REPL_DESC[${rcheck}]}) Replicated folder is back up" >> ${NM_LOGFILE} + if [ -f ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.errtime ]; then + SENDNOTICE "Repl-Timeout-'${NM_HOSTNAMES[${nip}]}[${nip}]'" "Replicated folder is back up!\n${NM_REPL_DESC[${rcheck}]} (${NM_REPL_CHECK_LOC[${rcheck}]})" + echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - (${NM_REPL_DESC[${rcheck}]}) Replicated folder is back up" >> ${NM_LOGFILE} + fi fi fi done