From 1152ac7e56b3560c4556c53585e2a87195c4205e Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 16 Dec 2023 19:00:12 -0600
Subject: [PATCH] Update status.inc

---
 inc/status.inc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/inc/status.inc b/inc/status.inc
index 960e8571..191adcdb 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -632,9 +632,10 @@ STATUS_NODE(){
 								if [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.disable ]; then
 									
 									if [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.down ]; then
-										SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "'${docker}' ${NM_DOCKER_DESC[${docker}]} - is down, could not fix" 1
+										SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "'${docker}' ${NM_DOCKER_DESC[${docker}]} - is down, will try and fix in 1min" 1
 										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}
+										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
 										[ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.errtime ] && mv ${NM_TMPFOLDER}/${nip}~${docker}.down ${NM_TMPFOLDER}/${nip}~${docker}.errtime
@@ -648,16 +649,14 @@ STATUS_NODE(){
 										touch ${NM_TMPFOLDER}/${nip}~${docker}.fix
 										sleep 10s
 										if [ "$(${NCMD} docker ps -q -f name=${docker})" ]; then
-											if [ "${STATUS_ACTION}" != "check" ]; then
-												echo -en "${idsCL[Green]}Running - Fixed"
-											fi
+											[ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[Green]}Running - Fixed"
 											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}
 
 										else
 											if [ "${STATUS_ACTION}" != "check" ]; then
-												echo -en "${idsCL[Red]}Not Running - Could Not Fix!"
+												[ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[Red]}Not Running - Could Not Fix!"
 												SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "'${docker}' ${NM_DOCKER_DESC[${docker}]} - is down, could not fix" 1
 												touch ${NM_TMPFOLDER}/${nip}~${docker}.sent
 												touch ${NM_TMPFOLDER}/${nip}~${docker}.down
@@ -672,6 +671,7 @@ STATUS_NODE(){
 										touch ${NM_TMPFOLDER}/${nip}~${docker}.down
 										SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "'${docker}' ${NM_SERVICE_DESC[${docker}]} - is down" 1
 										touch ${NM_TMPFOLDER}/${nip}~${docker}.sent
+										echo -en "${idsCL[Red]}Not Running, could not fix earlier, FIX MX!"
 									fi
 									
 								else