From 7432d05edd1fc174f66c3e667a87440827da3073 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 13 Dec 2023 14:31:25 -0600 Subject: [PATCH] Update status.inc --- inc/status.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/inc/status.inc b/inc/status.inc index a0d10172..197359cf 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -555,7 +555,7 @@ STATUS_NODE(){ echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - ${NM_SERVICE_DESC[${srvc}]} is down" >> ${NM_LOGFILE} [ "${srvc}" == "pdnsadmin" ] && ${NCMD} systemctl restart ${srvc} & - elif [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ]; then + else [ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})" if ([ -f ${NM_TMPFOLDER}/${nip}~${srvc}.sent ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.sent)) -gt ${NM_RENOTIFY_TIMEOUT} ]) || ([ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.sent ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.down)) -gt 60 ]); then [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.errtime ] && mv ${NM_TMPFOLDER}/${nip}~${srvc}.down ${NM_TMPFOLDER}/${nip}~${srvc}.errtime @@ -563,8 +563,6 @@ STATUS_NODE(){ SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "'${srvc}' ${NM_SERVICE_DESC[${srvc}]} - is down" 1 touch ${NM_TMPFOLDER}/${nip}~${srvc}.sent fi - elif [ -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ]; then - [ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[Yellow]}Disabled - Skipping" fi else [ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[LightGreen]}Running"