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

Update status.inc

Browse Source
This commit is contained in:
David Schroeder
2024-01-01 16:27:06 -06:00
parent b80f1b7b56
commit 6a8fe4ef02
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
inc/status.inc
View File

@@ -69,10 +69,10 @@ STATUS(){
[ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[LightCyan]}Starting processes to collect node service & docker info : " [ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[LightCyan]}Starting processes to collect node service & docker info : "
for NTYPE in "${ntypesel[@]}"; do for NTYPE in "${ntypesel[@]}"; do
until [ $(ls ${STATUSRUN_TMPFOLDER}/status-check.*.inprocess 2>/dev/null | wc -l) -lt ${SCAN_THREADS} ]; do until [ $(ls ${STATUSRUN_TMPFOLDER}/status-check.*.running 2>/dev/null | wc -l) -lt ${SCAN_THREADS} ]; do
tmp=tmp tmp=tmp
done done
STATUS_NODE ${NTYPE} > ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.running 2>/dev/null & STATUS_NODE ${NTYPE} > ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.results 2>/dev/null &
done done
[ "${STATUS_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}" [ "${STATUS_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
@@ -156,7 +156,7 @@ STATUS(){
for nodestatus in ${STATUSRUN_TMPFOLDER}/status-check.*.done; do for nodestatus in ${STATUSRUN_TMPFOLDER}/status-check.*.done; do
NTS=$(grep -oP '(?<=status-check.).*?(?=.done)' <<< "${nodestatus}") NTS=$(grep -oP '(?<=status-check.).*?(?=.done)' <<< "${nodestatus}")
if [ "${NTS}" != "*" ]; then if [ "${NTS}" != "*" ]; then
nodestatus=$(cat ${STATUSRUN_TMPFOLDER}/status-check.${NTS}.running) nodestatus=$(cat ${STATUSRUN_TMPFOLDER}/status-check.${NTS}.results)
[ "${nodestatus}" != "" ] && echo -e "${nodestatus}" [ "${nodestatus}" != "" ] && echo -e "${nodestatus}"
rm -f ${STATUSRUN_TMPFOLDER}/status-check.${NTS}.done rm -f ${STATUSRUN_TMPFOLDER}/status-check.${NTS}.done
((nc_count++)) ((nc_count++))
@@ -181,7 +181,7 @@ STATUS(){
# until [ "${completed}" == "true" ]; do # until [ "${completed}" == "true" ]; do
# if [ -f ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.done ]; then # if [ -f ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.done ]; then
# completed=true # completed=true
# echo -e "$(cat ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.running)" # echo -e "$(cat ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.results)"
# fi # fi
# done # done
# done # done
@@ -436,7 +436,7 @@ STATUS_NODE(){
dockers=${NODETYPE}_DOCKERS_CHECK[@] dockers=${NODETYPE}_DOCKERS_CHECK[@]
hosts=${NODETYPE}_HOSTS[@] hosts=${NODETYPE}_HOSTS[@]
NTHOSTS=${NODETYPE}_HOSTS[@] NTHOSTS=${NODETYPE}_HOSTS[@]
touch ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.inprocess touch ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.running
if ([[ ! -v ${NODETYPE}_DOCKERS_CHECK ]] && [ "${STATUS_ACTION}" == "dockers" ]) || ([ "${NM_SERVICES_CHECK[${NODETYPE}]}" == "" ] && [ "${STATUS_ACTION}" == "services" ]); then if ([[ ! -v ${NODETYPE}_DOCKERS_CHECK ]] && [ "${STATUS_ACTION}" == "dockers" ]) || ([ "${NM_SERVICES_CHECK[${NODETYPE}]}" == "" ] && [ "${STATUS_ACTION}" == "services" ]); then
GOFORCHECK=false; GOFORCHECK=false;
@@ -767,8 +767,7 @@ STATUS_NODE(){
done done
fi #GOFORCHECK fi #GOFORCHECK
rm -f ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.inprocess mv ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.running ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.done
touch ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.done
} }