voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

update

Browse Source
This commit is contained in:
David Schroeder
2023-04-27 10:42:59 -05:00
parent 7664b6a5ae
commit 63d128d152
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='4.5.13-04262023' VERS='4.5.14-04262023'
NODETYPES=PW NODETYPES=PW
NODETYPES=MYSQL,LB,WEB,NC,WPD,LPD,MM,PW NODETYPES=MYSQL,LB,WEB,NC,WPD,LPD,MM,PW

12
nodemgmt-scripts.sh
View File

@@ -2771,20 +2771,24 @@ if [ ${action-x} ]; then
if [ ! -f "${FOLDER}/status-check.running" ]; then if [ ! -f "${FOLDER}/status-check.running" ]; then
touch "${FOLDER}/status-check.running" touch "${FOLDER}/status-check.running"
if [ "${2}" == "report" ]; then 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 rm -f ${FOLDER}/status-check.lastrun
echo -e "$(date) - Starting status check #############################\n" > ${FOLDER}/status-check.lastrun mv ${FOLDER}/status-check.running ${FOLDER}/status-check.lastrun
STATUS report ${3} >> ${FOLDER}/status-check.lastrun
echo -e "\n\n$(date) - Finished status check #############################\n" >> ${FOLDER}/status-check.lastrun
if [ "${3}" = "email" ]; then if [ "${3}" = "email" ]; then
echo -e "\n\n" >> ${FOLDER}/status-check.lastrun echo -e "\n\n" >> ${FOLDER}/status-check.lastrun
DOWNLIST report >> ${FOLDER}/status-check.lastrun DOWNLIST report >> ${FOLDER}/status-check.lastrun
STATUSLOG="$(cat ${FOLDER}/status-check.lastrun)" STATUSLOG="$(cat ${FOLDER}/status-check.lastrun)"
SENDNOTICE "Status Report" "Status Report\n${STATUSLOG}" SENDNOTICE "Status Report" "Status Report\n${STATUSLOG}"
else
rm -f ${FOLDER}/status-check.running
fi fi
else else
STATUS ${2} ${3} STATUS ${2} ${3}
fi fi
rm -f "${FOLDER}/status-check.running" rm -f ${FOLDER}/status-check.lastrun
mv ${FOLDER}/status-check.running ${FOLDER}/status-check.lastrun
else else
echo -e "${idsCL[LightYellow]}Status check already running, please wait and try again${idsCL[Default]}" echo -e "${idsCL[LightYellow]}Status check already running, please wait and try again${idsCL[Default]}"
echo echo