From e81e3a1366bde167aedd71fc294eca50b61d720c Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 13 Jun 2025 19:14:24 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- inc/status.inc | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/defaults.inc b/defaults.inc index 785479f3..209ac45c 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.5.21-06132025' +VERS='5.5.22-06132025' 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 offsite-staticroute-fix ' diff --git a/inc/status.inc b/inc/status.inc index 4068ef4f..32781e01 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -777,15 +777,20 @@ STATUS_NODE(){ if [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.down ]; then 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!" + if [ "${NM_DOCKER_COMPOSE_LOC[${docker}]}" != "" ]; then + 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!" + else + echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - ${NM_DOCKER_DESC[${docker}]} (docker) is down" >> ${NM_LOGFILE} + echo -en "${idsCL[Red]}Not Running" + fi elif ([ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.fix ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${docker}.down)) -gt 50 ]) || ([ -f ${NM_TMPFOLDER}/${nip}~${docker}.fix ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${docker}.fix)) -ge 3600 ]); then [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.errtime ] && mv ${NM_TMPFOLDER}/${nip}~${docker}.down ${NM_TMPFOLDER}/${nip}~${docker}.errtime if [ "$(${NCMD} docker ps -a | grep ${docker})" ]; then ${NCMD} docker start ${docker} >/dev/null 2>&1 echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - ${NM_DOCKER_DESC[${docker}]} (docker) is not running, starting now" >> ${NM_LOGFILE} - else + elif [ "${NM_DOCKER_COMPOSE_LOC[${docker}]}" != "" ] || [ "${docker}" == "watchtower" ] || [ "${docker}" == "portainer_agent" ]; then if [ "${docker}" == "watchtower" ]; then ${NCMD} runup watchtower >/dev/null 2>&1 elif [ "${docker}" == "portainer_agent" ]; then