From d9a2a3b08f26ca840591382d2c5c5675f269d5cd Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 16 Dec 2023 19:21:24 -0600
Subject: [PATCH] update

---
 defaults.inc   | 2 +-
 inc/status.inc | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index b948072d..fe375e95 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-VERS='5.1.25-12162023'
+VERS='5.1.26-12162023'
 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/status.inc b/inc/status.inc
index 53b99749..bf8e9a3b 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -636,7 +636,7 @@ STATUS_NODE(){
 										echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - ${NM_DOCKER_DESC[${docker}]} (docker) is down, will try and fix in 1min" >> ${NM_LOGFILE}
 										echo -en "${idsCL[Red]}Not Running - will try and fix in 1min!"
 										
-									elif [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.fix ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${docker}.down)) -gt 60 ]; then
+									elif [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.fix ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${docker}.down)) -gt 50 ]; then
 										[ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.errtime ] && mv ${NM_TMPFOLDER}/${nip}~${docker}.down ${NM_TMPFOLDER}/${nip}~${docker}.errtime
 										if [ "$(${NCMD} docker ps -a | grep ${docker})" ]; then
 											${NCMD} docker start ${docker} >/dev/null 2>&1
@@ -649,7 +649,7 @@ STATUS_NODE(){
 										sleep 10s
 										if [ "$(${NCMD} docker ps -q -f name=${docker})" ]; then
 											[ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[Green]}Running - Fixed"
-											[ -f touch ${NM_TMPFOLDER}/${nip}~${docker}.sent ] && SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "'${docker}' ${NM_DOCKER_DESC[${docker}]} - is fixed"
+											[ -f ${NM_TMPFOLDER}/${nip}~${docker}.sent ] && SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "'${docker}' ${NM_DOCKER_DESC[${docker}]} - is fixed"
 											rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
 											echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - ${NM_DOCKER_DESC[${docker}]} (docker) is fixed" >> ${NM_LOGFILE}
 
@@ -664,7 +664,7 @@ STATUS_NODE(){
 											fi
 										fi										
 										
-									elif [ -f ${NM_TMPFOLDER}/${nip}~${docker}.fix ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${docker}.sent)) -gt ${NM_RENOTIFY_TIMEOUT} ]; then
+									elif [ -f ${NM_TMPFOLDER}/${nip}~${docker}.fix ] && ([ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.sent ] || ([ -f ${NM_TMPFOLDER}/${nip}~${docker}.sent ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${docker}.sent)) -gt ${NM_RENOTIFY_TIMEOUT} ])); then
 										toterrtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${docker}.errtime))
 										[ "${STATUS_ACTION}" != "check" ] && echo -e "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})${idsCL[Default]}"
 										touch ${NM_TMPFOLDER}/${nip}~${docker}.down
@@ -678,7 +678,7 @@ STATUS_NODE(){
 								fi
 							else
 								if [ -f ${NM_TMPFOLDER}/${nip}~${docker}.fix ]; then
-									[ -f touch ${NM_TMPFOLDER}/${nip}~${docker}.sent ] && SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "'${docker}' ${NM_DOCKER_DESC[${docker}]} - is fixed"
+									[ -f ${NM_TMPFOLDER}/${nip}~${docker}.sent ] && SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "'${docker}' ${NM_DOCKER_DESC[${docker}]} - is fixed"
 									[ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[Green]}Running - Fixed"
 								else
 									[ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[LightGreen]}Running"