From 2cafd992cd7df395d1e5135960ee47d10163e09f Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 6 Dec 2023 10:04:43 -0600 Subject: [PATCH] Update status.inc --- inc/status.inc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/inc/status.inc b/inc/status.inc index 1ffe6c99..a68802a5 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -556,7 +556,6 @@ STATUS_NODE(){ toterrtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.errtime)) touch ${NM_TMPFOLDER}/${nip}~${srvc}.down SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_SERVICE_DESC[${srvc}]} is down" 1 - # ([ "${srvc}" == "mysql" ] || [ "${srvc}" == "mariadb" ]) && ${NCMD} systemctl restart ${srvc} & elif [ ${errtime} -gt 60 ] && [ ${errtime} -lt 180 ] && [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.errtime ]; then SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_SERVICE_DESC[${srvc}]} is down" 1 @@ -574,10 +573,7 @@ STATUS_NODE(){ rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.* fi - # if [ "${srvc}" == "pdnsadmin.socket" ] || [ "${srvc}" == "pdnsadmin" ] || [ "${srvc}" == "gitea" ]; then - if [ "${srvc}" == "gitea" ] || [ "${srvc}" == "headscale" ]; then - rm -f ${NM_FOLDER}/*~${srvc}.* - fi + [ "${srvc}" == "gitea" ] || [ "${srvc}" == "headscale" ] && rm -f ${NM_FOLDER}/*~${srvc}.* fi [ "${mysqlgo}" = "true" ] && unset mysqlgo [ "${SSCHK}" == "primary" ] && echo -e "${idsCL[LightCyan]} - Primary Node${idsCL[Default]}" || echo -e "${idsCL[Default]}" @@ -684,7 +680,6 @@ STATUS_NODE(){ rm -f ${NM_TMPFOLDER}/${nip}~* if [ ! -f ${NM_TMPFOLDER}/${nip}.down ]; then touch ${NM_TMPFOLDER}/${nip}.down - # [ ! -f ${NM_TMPFOLDER}/${nip}.errtime ] && touch ${NM_TMPFOLDER}/${nip}.errtime if [ "${ST_ACTION}" != "check" ]; then if [ "${checkhost}" != "false" ]; then echo -e "${idsCL[Red]} - Node is online, but SSL is down!${idsCL[Default]}" @@ -695,7 +690,7 @@ STATUS_NODE(){ # SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_HOSTNAMES[${nip}]}[${nip}] is down" 1 [ "${checkhostssl}" != "ok" ] && echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - Node is down" >> ${NM_LOGFILE} else - if [ ! -f ${NM_TMPFOLDER}/${nip}.errtime ]; then + if [ ! -f ${NM_TMPFOLDER}/${nip}.errtime ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}.down)) -gt 60 ]; then mv ${NM_TMPFOLDER}/${nip}.down ${NM_TMPFOLDER}/${nip}.errtime toterrtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}.errtime)) errtime=${toterrtime}