diff --git a/defaults.inc b/defaults.inc index e936f9ea..da9cbbea 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.10.37-07242023' +VERS='4.10.40-07242023' 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 82764384..20465929 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -786,28 +786,28 @@ GUI(){ DOWNLIST ${2} fi;; status) - if [ -f "${NM_FOLDER}/status-check.running" ] && [ $(expr `date +%s` - $(stat -c %Y ${NM_FOLDER}/status-check.running)) -gt 1800 ]; then - # if [ -f "${NM_FOLDER}/status-check.running" ]; then + if [ -f "${NM_TMPFOLDER}/status-check.running" ] && [ $(expr `date +%s` - $(stat -c %Y ${NM_TMPFOLDER}/status-check.running)) -gt 1800 ]; then + # if [ -f "${NM_TMPFOLDER}/status-check.running" ]; then SENDNOTICE "Nodemgmt Script Error" "Status monitoring stuck, system resetting... fix yo shit" - mv -f ${NM_FOLDER}/status-check.running ${NM_FOLDER}/status-check.running.crash + mv -f ${NM_TMPFOLDER}/status-check.running ${NM_TMPFOLDER}/status-check.running.crash getStuckNM=$(pgrep -f '/nodemgmt') for i in $getStuckNM; do [ "$BASHPID" != "$i" ] && /bin/kill -9 $i done fi - if [ ! -f "${NM_FOLDER}/status-check.running" ]; then - touch "${NM_FOLDER}/status-check.running" + if [ ! -f "${NM_TMPFOLDER}/status-check.running" ]; then + touch "${NM_TMPFOLDER}/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 -e "$(date) - Starting status check #############################\n" > ${NM_TMPFOLDER}/status-check.running + STATUS report ${3} >> ${NM_TMPFOLDER}/status-check.running + echo -e "\n\n$(date) - Finished status check #############################\n" >> ${NM_TMPFOLDER}/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 + mv ${NM_TMPFOLDER}/status-check.running ${NM_FOLDER}/status-check.lastrun # end_status=`date +%s` # runtime_status=$((end_status-start_status)) @@ -821,7 +821,7 @@ GUI(){ fi else STATUS ${2} ${3} - rm -f ${NM_FOLDER}/status-check.running + rm -f ${NM_TMPFOLDER}/status-check.running fi else # echo -e "${idsCL[LightYellow]}Status check already running, please wait and try again${idsCL[Default]}" @@ -829,7 +829,7 @@ GUI(){ echo -en "${idsCL[LightCyan]}View the (L)ive log, or the (P)revious run log instead? ${idsCL[Default]}" read -n1 choice case $choice in - [Ll]) watch -n1 tail -n35 ${NM_FOLDER}/status-check.running; echo;; + [Ll]) watch -n1 tail -n35 ${NM_TMPFOLDER}/status-check.running; echo;; [Pp]) echo; cat ${NM_FOLDER}/status-check.lastrun;; esac echo