diff --git a/defaults.inc b/defaults.inc index d3c9ffc7..45edbd37 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='4.5.13-04262023' +VERS='4.5.14-04262023' NODETYPES=PW NODETYPES=MYSQL,LB,WEB,NC,WPD,LPD,MM,PW diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index bad07a93..b397902e 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -2771,20 +2771,24 @@ if [ ${action-x} ]; then if [ ! -f "${FOLDER}/status-check.running" ]; then touch "${FOLDER}/status-check.running" if [ "${2}" == "report" ]; then + echo -e "$(date) - Starting status check #############################\n" > ${FOLDER}/status-check.running + STATUS report ${3} >> ${FOLDER}/status-check.running + echo -e "\n\n$(date) - Finished status check #############################\n" >> ${FOLDER}/status-check.running rm -f ${FOLDER}/status-check.lastrun - echo -e "$(date) - Starting status check #############################\n" > ${FOLDER}/status-check.lastrun - STATUS report ${3} >> ${FOLDER}/status-check.lastrun - echo -e "\n\n$(date) - Finished status check #############################\n" >> ${FOLDER}/status-check.lastrun + mv ${FOLDER}/status-check.running ${FOLDER}/status-check.lastrun if [ "${3}" = "email" ]; then echo -e "\n\n" >> ${FOLDER}/status-check.lastrun DOWNLIST report >> ${FOLDER}/status-check.lastrun STATUSLOG="$(cat ${FOLDER}/status-check.lastrun)" SENDNOTICE "Status Report" "Status Report\n${STATUSLOG}" + else + rm -f ${FOLDER}/status-check.running fi else STATUS ${2} ${3} fi - rm -f "${FOLDER}/status-check.running" + rm -f ${FOLDER}/status-check.lastrun + mv ${FOLDER}/status-check.running ${FOLDER}/status-check.lastrun else echo -e "${idsCL[LightYellow]}Status check already running, please wait and try again${idsCL[Default]}" echo