diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 42506635..8d613f54 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -262,11 +262,11 @@ STATUS(){ echo -en " ${NM_DOCKERS[${docker}]}$spc: " 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} - fi - ${NCMD} docker-compose -f ${NM_DOCKER_COMPOSE[${docker}]}/docker-compose.yml up -d - sleep 10s + # if [ "$(${NCMD} docker ps -aq -f status=exited -f name=${docker})" ]; then + # ${NCMD} docker rm ${docker} + # fi + # ${NCMD} 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 echo -e "${idsCL[Green]}Running - Fixed${idsCL[Default]}" @@ -274,6 +274,24 @@ STATUS(){ else if [ "${ST_ACTION}" != "check" ]; then echo -e "${idsCL[Red]}Not Running - Could Not Fix!${idsCL[Default]}" + + if [ ! -f ${FOLDER}/${nip}-${docker}.down ]; then + if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo -e "${NM_SERVICES[${docker}]} is down\t$(date)" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}; fi + touch ${FOLDER}/${nip}-${docker}.down + else + errtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}-${docker}.down) + if [ $errtime -gt ${RENOTIFY} ]; then + if [ ! -f ${FOLDER}/${nip}-${docker}.errtime ]; then + mv ${FOLDER}/${nip}-${docker}.down ${FOLDER}/${nip}-${docker}.errtime + fi + toterrtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}-${docker}.errtime) + if [ "${ST_ACTION}" != "check" ]; then + echo -e "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})${idsCL[Default]}" + fi + touch ${FOLDER}/${nip}-${docker}.down + fi + fi + fi fi else