diff --git a/defaults.inc b/defaults.inc index d5d17221..563783ae 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.17.111-12052023' +VERS='4.17.112-12052023' 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.new.inc b/inc/status.new.inc index 43c0116d..ab04fcc0 100755 --- a/inc/status.new.inc +++ b/inc/status.new.inc @@ -133,7 +133,7 @@ STATUSNEW(){ for NTYPE in "${ntypesel[@]}"; do - STATUS_NODE ${NTYPE} & + STATUS_NODE ${NTYPE} > ${NM_TMPFOLDER}/status-check.${NTYPE}.running & done @@ -741,4 +741,7 @@ STATUS_NODE(){ done fi #GOFORCHECK + + touch ${NM_TMPFOLDER}/status-check.${NTYPE}.done + } diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 43402e4a..57ac34da 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -884,7 +884,7 @@ GUI(){ # start_status=`date +%s` echo "$(date +%Y-%m-%d-%H-%M-%S) - LOCAL - ${NODE_HOSTNAME} - Starting Status Check" >> ${NM_LOGFILE} echo -e "$(date +%Y-%m-%d-%H-%M-%S) - Starting status check #############################\n" > ${NM_TMPFOLDER}/status-check.running - STATUS report ${3} >> ${NM_TMPFOLDER}/status-check.running + STATUSNEW report ${3} >> ${NM_TMPFOLDER}/status-check.running echo -e "\n\n$(date) - Finished status check #############################\n" >> ${NM_TMPFOLDER}/status-check.running echo "$(date +%Y-%m-%d-%H-%M-%S) - LOCAL - ${NODE_HOSTNAME} - Completed Status Check" >> ${NM_LOGFILE}