From b08699b5b74209524d0601a9122b779d05154312 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 16 Dec 2023 19:13:10 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/status.inc | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/defaults.inc b/defaults.inc index f4eb9b0e..b948072d 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='5.1.24-12162023' +VERS='5.1.25-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 0c0d086f..53b99749 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -632,7 +632,6 @@ 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, 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, will try and fix in 1min" >> ${NM_LOGFILE} echo -en "${idsCL[Red]}Not Running - will try and fix in 1min!" @@ -650,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" - SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "'${docker}' ${NM_DOCKER_DESC[${docker}]} - is fixed" + [ -f touch ${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} @@ -678,8 +677,11 @@ STATUS_NODE(){ echo -en "${idsCL[Yellow]}Disabled - Skipping" fi else - if [ "${STATUS_ACTION}" != "check" ]; then - echo -en "${idsCL[LightGreen]}Running" + 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" + [ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[Green]}Running - Fixed" + else + [ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[LightGreen]}Running" fi if [[ "${NM_SINGLESRVR_DOCKERS[${NODETYPE}]}" = *"${docker}"* ]]; then for tnip in "${!NTHOSTS}"; do