From 6a7f1c1ea01b9376f7e806ed81b0842fcbd2d9ac Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 23 May 2023 21:42:11 -0500
Subject: [PATCH] update

---
 defaults.inc   |  2 +-
 inc/status.inc | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 85234c6b..1807576e 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='4.6.62-05232023'
+VERS='4.6.63-05232023'
 
 NODETYPES=WEB
 #NODETYPES=LB,LPD,MM,MYSQL,NC,PW,WPD,WM,WEB
diff --git a/inc/status.inc b/inc/status.inc
index 1cc971ef..b07b588e 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -341,10 +341,13 @@ STATUS(){
 									fi
 								
 									if [ ! "$(${NCMD} docker ps -q -f name=${docker})" ]; then
-										if [ "$(${NCMD} docker ps -aq -f status=exited -f name=${docker})" ]; then
-											${NCMD} docker rm ${docker} >/dev/null 2>&1
+										if [ "$(${NCMD} docker ps -a | grep ${docker})" ]; then
+											${NCMD} docker start ${docker} >/dev/null 2>&1
+											echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_DOCKERS[${docker}]} (docker) is not running, starting now" >> ${LOGFILE}
+										else
+											${NCMD} /usr/local/bin/docker-compose -f ${NM_DOCKER_COMPOSE[${docker}]}/docker-compose.yml up -d >/dev/null 2>&1
+											echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_DOCKERS[${docker}]} (docker) is not found, creating and starting now" >> ${LOGFILE}
 										fi
-										${NCMD} /usr/local/bin/docker-compose -f ${NM_DOCKER_COMPOSE[${docker}]}/docker-compose.yml up -d >/dev/null 2>&1
 										sleep 10s
 										if [ "$(${NCMD} docker ps -q -f name=${docker})" ]; then
 											if [ "${ST_ACTION}" != "check" ]; then
@@ -359,9 +362,9 @@ STATUS(){
 												echo -e "${idsCL[Red]}Not Running - Could Not Fix!${idsCL[Default]}"
 										
 												if [ ! -f ${TMPFOLDER}/${nip}~${docker}.down ]; then
-													SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_DOCKERS[${docker}]} is down" 1
+													SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_DOCKERS[${docker}]} is down, could not fix" 1
 													touch ${TMPFOLDER}/${nip}~${docker}.down
-													echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_DOCKERS[${docker}]} (docker) is down" >> ${LOGFILE}
+													echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_DOCKERS[${docker}]} (docker) is down, could not fix" >> ${LOGFILE}
 												else
 													errtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}~${docker}.down)
 													if [ $errtime -gt ${RENOTIFY} ]; then