diff --git a/inc/status.inc b/inc/status.inc index e67a55be..f9919beb 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -98,7 +98,7 @@ STATUS(){ echo "$(date +%Y-%m-%d-%H-%M-%S) - LOCAL - ${NODE_HOSTNAME} - ${NM_SERVICE_DESC[${srvc}]} is down" >> ${NM_LOGFILE} else errtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down)) - if [ $errtime -gt ${NM_RENOTIFY_TIMEOUT} ]; then + if [ ${errtime} -gt ${NM_RENOTIFY_TIMEOUT} ]; then if [ ! -f ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.errtime ]; then mv ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.errtime fi @@ -271,14 +271,14 @@ STATUS(){ elif [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ]; then errtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.down)) - if [ $errtime -gt ${NM_RENOTIFY_TIMEOUT} ]; then + if [ ${errtime} -gt ${NM_RENOTIFY_TIMEOUT} ]; then [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.errtime ] && mv ${NM_TMPFOLDER}/${nip}~${srvc}.down ${NM_TMPFOLDER}/${nip}~${srvc}.errtime 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 + 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 fi @@ -372,7 +372,7 @@ STATUS(){ echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - ${NM_DOCKER_DESC[${docker}]} (docker) is down, could not fix" >> ${NM_LOGFILE} else errtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${docker}.down)) - if [ $errtime -gt ${NM_RENOTIFY_TIMEOUT} ]; then + if [ ${errtime} -gt ${NM_RENOTIFY_TIMEOUT} ]; then if [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.errtime ]; then mv ${NM_TMPFOLDER}/${nip}~${docker}.down ${NM_TMPFOLDER}/${nip}~${docker}.errtime fi @@ -404,14 +404,11 @@ STATUS(){ rm -f ${NM_TMPFOLDER}/${nip}~* if [ ! -f ${NM_TMPFOLDER}/${nip}.down ]; then touch ${NM_TMPFOLDER}/${nip}.down - if [ ! -f ${NM_TMPFOLDER}/${nip}.errtime ]; then - touch ${NM_TMPFOLDER}/${nip}.errtime - fi + # [ ! -f ${NM_TMPFOLDER}/${nip}.errtime ] && touch ${NM_TMPFOLDER}/${nip}.errtime if [ "${ST_ACTION}" != "check" ]; then toterrtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}.errtime)) if [ "${checkhost}" != "false" ]; then echo -e "${idsCL[Red]} - Node is online, but SSL is down!${idsCL[Default]}" - else echo -e "${idsCL[Red]} - Node is down!${idsCL[Default]}" fi @@ -419,6 +416,9 @@ STATUS(){ # 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 + + fi toterrtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}.errtime)) errtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}.down)) if [ "${ST_ACTION}" != "check" ]; then @@ -435,7 +435,7 @@ STATUS(){ SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_HOSTNAMES[${nip}]}[${nip}] has been down for $(SHOW_TIME ${toterrtime})" 1 fi touch ${NM_TMPFOLDER}/${nip}.sent - elif [ $errtime -gt 60 ] && [ $errtime -lt 240 ] && [ ! -f ${NM_TMPFOLDER}/${nip}.errtime ]; then + elif [ ${errtime} -gt 60 ] && [ ${errtime} -lt 240 ] && [ ! -f ${NM_TMPFOLDER}/${nip}.errtime ]; then if [ "${checkhost}" != "false" ]; then SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_HOSTNAMES[${nip}]}[${nip}] is online, but SSL is down" 1 else