From 0f2ef64553412ea7aaa91df5787a710a8f1626e2 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 16 Jul 2023 15:27:59 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- nodemgmt-scripts.sh | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/defaults.inc b/defaults.inc index a399cf55..c31a93a1 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='4.9.8-07062023' +VERS='4.9.10-07062023' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns ' CERT_DAEMON='/snap/bin/certbot' diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 30460abe..23024cc1 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -798,20 +798,23 @@ GUI(){ [ ${fd} -lt ${cbd} ] && rm -f "${NM_FOLDER}/status-check.running" fi if [ ! -f "${NM_FOLDER}/status-check.running" ]; then - start_status=`date +%s` touch "${NM_FOLDER}/status-check.running" if [ "${2}" == "report" ]; then + start_status=`date +%s` echo "$(date) - LOCAL - ${NODE_HOSTNAME} - Starting Status Check" >> ${NM_LOGFILE} echo -e "$(date) - Starting status check #############################\n" > ${NM_FOLDER}/status-check.running STATUS report ${3} >> ${NM_FOLDER}/status-check.running echo -e "\n\n$(date) - Finished status check #############################\n" >> ${NM_FOLDER}/status-check.running echo "$(date) - LOCAL - ${NODE_HOSTNAME} - Completed Status Check" >> ${NM_LOGFILE} + rm -f ${NM_FOLDER}/status-check.lastrun mv ${NM_FOLDER}/status-check.running ${NM_FOLDER}/status-check.lastrun + end_status=`date +%s` runtime_status=$((end_status-start_status)) echo -e "\nRuntime: ${runtime_status}" >> ${NM_FOLDER}/status-check.lastrun - if [ "${3}" = "email" ]; then + + if [ "${3}" == "email" ]; then echo -e "\n\n" >> ${NM_FOLDER}/status-check.lastrun DOWNLIST report >> ${NM_FOLDER}/status-check.lastrun STATUSLOG="$(cat ${NM_FOLDER}/status-check.lastrun)"