From 45b29ae1c5dccc79e9756c63e0a5b740edb1c623 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 7 May 2023 18:34:38 -0500 Subject: [PATCH] Update status.inc --- inc/status.inc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/inc/status.inc b/inc/status.inc index e190b204..df800bb9 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -62,38 +62,38 @@ STATUS(){ fi if [ "$(systemctl is-active ${srvc})" != "active" ]; then - if [ ! -f ${FOLDER}/${NODE_HOSTNAME}-${srvc}.down ]; then + if [ ! -f ${TMPFOLDER}/${NODE_HOSTNAME}-${srvc}.down ]; then if [ "${ST_ACTION}" != "check" ]; then echo -e "${idsCL[Red]}Not Running${idsCL[Default]}" fi SENDNOTICE "${NODE_HOSTNAME}" "${NM_SERVICES[${srvc}]} is down" 1 - touch ${FOLDER}/${NODE_HOSTNAME}-${srvc}.down + touch ${TMPFOLDER}/${NODE_HOSTNAME}-${srvc}.down echo "$(date) - LOCAL - ${NODE_HOSTNAME} - ${NM_SERVICES[${srvc}]} is down" >> ${LOGFILE} else - errtime=`date +%s`-$(stat -c %Y ${FOLDER}/${NODE_HOSTNAME}-${srvc}.down) + errtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${NODE_HOSTNAME}-${srvc}.down) if [ $errtime -gt ${RENOTIFY} ]; then - if [ ! -f ${FOLDER}/${NODE_HOSTNAME}-${srvc}.errtime ]; then - mv ${FOLDER}/${NODE_HOSTNAME}-${srvc}.down ${FOLDER}/${NODE_HOSTNAME}-${srvc}.errtime + if [ ! -f ${TMPFOLDER}/${NODE_HOSTNAME}-${srvc}.errtime ]; then + mv ${TMPFOLDER}/${NODE_HOSTNAME}-${srvc}.down ${TMPFOLDER}/${NODE_HOSTNAME}-${srvc}.errtime fi - toterrtime=`date +%s`-$(stat -c %Y ${FOLDER}/${NODE_HOSTNAME}-${srvc}.errtime) + toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${NODE_HOSTNAME}-${srvc}.errtime) if [ "${ST_ACTION}" != "check" ]; then echo -e "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})${idsCL[Default]}" fi - touch ${FOLDER}/${NODE_HOSTNAME}-${srvc}.down + touch ${TMPFOLDER}/${NODE_HOSTNAME}-${srvc}.down fi fi else if [ "${ST_ACTION}" != "check" ]; then echo -e "${idsCL[Green]}Running${idsCL[Default]}" fi - if [ -f ${FOLDER}/${NODE_HOSTNAME}-${srvc}.down ]; then - if [ -f ${FOLDER}/${NODE_HOSTNAME}-${srvc}.errtime ]; then - toterrtime=`date +%s`-$(stat -c %Y ${FOLDER}/${NODE_HOSTNAME}-${srvc}.errtime) + if [ -f ${TMPFOLDER}/${NODE_HOSTNAME}-${srvc}.down ]; then + if [ -f ${TMPFOLDER}/${NODE_HOSTNAME}-${srvc}.errtime ]; then + toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${NODE_HOSTNAME}-${srvc}.errtime) else - toterrtime=`date +%s`-$(stat -c %Y ${FOLDER}/${NODE_HOSTNAME}-${srvc}.down) + toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${NODE_HOSTNAME}-${srvc}.down) fi SENDNOTICE "${NODE_HOSTNAME}" "${NM_SERVICES[${srvc}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})" - rm -f ${FOLDER}/${NODE_HOSTNAME}-${srvc}.* + rm -f ${TMPFOLDER}/${NODE_HOSTNAME}-${srvc}.* echo "$(date) - LOCAL - ${NODE_HOSTNAME} - ${NM_SERVICES[${srvc}]} is back up" >> ${LOGFILE} fi