From a2cfd6fc340258addb7f5513d6d29bc922710cf7 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 11 Sep 2023 21:58:16 -0500 Subject: [PATCH] Update status.inc --- inc/status.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/inc/status.inc b/inc/status.inc index 0f21dd97..e65dd87b 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -511,9 +511,9 @@ STATUS(){ snderrtime=`expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down)` echo "HERE: $snderrtime" if [ ${snderrtime} -gt 10 ]; then - toterrtime=`date +%s`-$(stat -c %Y ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.errtime) + toterrtime=`expr $(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 +It 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 @@ -522,11 +522,13 @@ Has been down for: $(SHOW_TIME ${toterrtime})" 1 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* 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}]})" + toterrtime=`expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.errtime)` + SENDNOTICE "Repl-'${NM_HOSTNAMES[${nip}]}[${nip}]'" "Replicated folder is back up!\n${NM_REPL_DESC[${rcheck}]} (${NM_REPL_CHECK_LOC[${rcheck}]}) +It was down for $(SHOW_TIME ${toterrtime})" echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - (${NM_REPL_DESC[${rcheck}]}) Replicated folder is back up" >> ${NM_LOGFILE} fi + rm -f ${NM_TMPFOLDER}/${nip}~${rcheck}.repl* fi fi done