diff --git a/defaults.inc b/defaults.inc index ae8f6f93..774c32b1 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.16.53-12052023' +VERS='4.17.53-12052023' NM_BETA=false noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck ' diff --git a/inc/services.inc b/inc/services.inc index 570ab7d4..3f146b05 100755 --- a/inc/services.inc +++ b/inc/services.inc @@ -527,7 +527,7 @@ CHECK_DOCKER_SERVICES(){ touch ${NM_TMPFOLDER}/${nip}.errtime fi else - errtime=`date +%s`-$(stat -c %Y ${NM_TMPFOLDER}/${nip}.down) + errtime=`expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}.down)` fi if [ "${ST_ACTION}" != "check" ]; then toterrtime=`expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}.errtime)` diff --git a/inc/status.inc b/inc/status.inc index 402e0df5..35e3797a 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -97,7 +97,7 @@ STATUS(){ touch ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down echo "$(date +%Y-%m-%d-%H-%M-%S) - LOCAL - ${NODE_HOSTNAME} - ${NM_SERVICE_DESC[${srvc}]} is down" >> ${NM_LOGFILE} else - errtime=`date +%s`-$(stat -c %Y ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down) + errtime=`expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down)` 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 @@ -270,7 +270,7 @@ STATUS(){ [ "${srvc}" == "pdnsadmin" ] && ${NCMD} systemctl restart ${srvc} & elif [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ]; then - errtime=`date +%s`-$(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.down) + errtime=`expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.down)` 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)` @@ -371,7 +371,7 @@ STATUS(){ touch ${NM_TMPFOLDER}/${nip}~${docker}.down 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=`date +%s`-$(stat -c %Y ${NM_TMPFOLDER}/${nip}~${docker}.down) + errtime=`expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${docker}.down)` 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 @@ -420,7 +420,7 @@ STATUS(){ [ "${checkhostssl}" != "ok" ] && echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - Node is down" >> ${NM_LOGFILE} else toterrtime=`expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}.errtime)` - errtime=`date +%s`-$(stat -c %Y ${NM_TMPFOLDER}/${nip}.down) + errtime=`expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}.down)` if [ "${ST_ACTION}" != "check" ]; then if [ "${checkhost}" != "false" ]; then echo -e "${idsCL[Red]} - Node SSL has been down for $(SHOW_TIME ${toterrtime}) ${idsCL[LightYellow]}${LH}${idsCL[Default]}"