diff --git a/defaults.inc b/defaults.inc index a45bb83e..69fde6fe 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,9 +1,9 @@ #!/usr/bin/env bash -VERS='4.6.30-05072023' +VERS='4.6.35-05072023' -#NODETYPES=WEB,LB -NODETYPES=MYSQL,LB,WEB,NC,WPD,LPD,MM,PW +NODETYPES=LB +#NODETYPES=MYSQL,LB,WEB,NC,WPD,LPD,MM,PW MYSQLHOSTS=10.10.1.51,10.10.1.52 WEBHOSTS=10.10.1.121,10.10.1.122 LBHOSTS=10.10.10.81,10.10.10.82 diff --git a/inc/status.inc b/inc/status.inc index 8867ad7c..587f8de1 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -156,7 +156,7 @@ STATUS(){ else toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}.down) fi - rm -f ${FOLDER}/${nip}.* + rm -f ${TMPFOLDER}/${nip}.* SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}-UP" "${NM_NODETYPES[$NTYPE]}-Node${nid} is back UP! It was down for $(SHOW_TIME ${toterrtime})" fi @@ -207,7 +207,7 @@ STATUS(){ SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_SERVICES[${srvc}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})" echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_SERVICES[${srvc}]} is back up, it was down for $(SHOW_TIME ${toterrtime})" >> ${LOGFILE} - rm -f ${FOLDER}/${nip}-${srvc}.* + rm -f ${TMPFOLDER}/${nip}-${srvc}.* fi # if [ "${srvc}" == "pdnsadmin.socket" ] || [ "${srvc}" == "pdnsadmin" ] || [ "${srvc}" == "gitea" ]; then @@ -332,29 +332,29 @@ STATUS(){ echo -e "${idsCL[Green]}Running - Fixed${idsCL[Default]}" fi SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_DOCKERS[${docker}]} is fixed" - rm -f ${FOLDER}/${nip}-${docker}.down - rm -f ${FOLDER}/${nip}-${docker}.errtime + rm -f ${TMPFOLDER}/${nip}-${docker}.down + rm -f ${TMPFOLDER}/${nip}-${docker}.errtime echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_DOCKERS[${docker}]} (docker) is fixed" >> ${LOGFILE} 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 [ ! -f ${TMPFOLDER}/${nip}-${docker}.down ]; then SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_DOCKERS[${docker}]} is down" 1 - touch ${FOLDER}/${nip}-${docker}.down + touch ${TMPFOLDER}/${nip}-${docker}.down echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_DOCKERS[${docker}]} (docker) is down" >> ${LOGFILE} else - errtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}-${docker}.down) + errtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}-${docker}.down) if [ $errtime -gt ${RENOTIFY} ]; then - if [ ! -f ${FOLDER}/${nip}-${docker}.errtime ]; then - mv ${FOLDER}/${nip}-${docker}.down ${FOLDER}/${nip}-${docker}.errtime + if [ ! -f ${TMPFOLDER}/${nip}-${docker}.errtime ]; then + mv ${TMPFOLDER}/${nip}-${docker}.down ${TMPFOLDER}/${nip}-${docker}.errtime fi - toterrtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}-${docker}.errtime) + toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${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 + touch ${TMPFOLDER}/${nip}-${docker}.down fi fi @@ -364,8 +364,8 @@ STATUS(){ if [ "${ST_ACTION}" != "check" ]; then echo -e "${idsCL[Green]}Running${idsCL[Default]}" fi - rm -f ${FOLDER}/${nip}-${docker}.down - rm -f ${FOLDER}/${nip}-${docker}.errtime + rm -f ${TMPFOLDER}/${nip}-${docker}.down + rm -f ${TMPFOLDER}/${nip}-${docker}.errtime fi done fi @@ -471,15 +471,15 @@ STATUS(){ if [ "${checked}" == "timeout" ]; then [ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Red]}Timeout${idsCL[Default]}" - if [ ! -f ${FOLDER}/${nip}-${rcheck}.down ]; then - touch ${FOLDER}/${nip}-${rcheck}.down + if [ ! -f ${TMPFOLDER}/${nip}-${rcheck}.down ]; then + touch ${TMPFOLDER}/${nip}-${rcheck}.down SENDNOTICE "Repl-Timeout-'${NM_NODETYPES[$NTYPE]}-Node${nid}'" "${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})" 1 echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - (${REPL_DESC[${rcheck}]}) Replicated folder timeout, it is not syncing" >> ${LOGFILE} fi else [ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Green]}Good${idsCL[Default]}" - if [ -f ${FOLDER}/${nip}-${rcheck}.down ]; then - rm -f ${FOLDER}/${nip}-${rcheck}.down + if [ -f ${TMPFOLDER}/${nip}-${rcheck}.down ]; then + rm -f ${TMPFOLDER}/${nip}-${rcheck}.down SENDNOTICE "Repl-Timeout-'${NM_NODETYPES[$NTYPE]}-Node${nid}'" "Replicated folder is back up!\n${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})" echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - (${REPL_DESC[${rcheck}]}) Replicated folder is back up" >> ${LOGFILE} fi