From bae1ecf074189375023e6780c27011605d550ac2 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 6 Dec 2023 21:10:03 -0600 Subject: [PATCH] Update status.inc --- inc/status.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/inc/status.inc b/inc/status.inc index 7eb329bf..b0fc7c01 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -31,8 +31,8 @@ STATUS(){ REPLSTART ${NTYPE} & done if [ "${ST_ACTION}" != "check" ]; then - echo -e "${idsCL[LightGreen]}Complete${idsCL[Default]}\n" - echo -en " ${idsCL[LightCyan]}Starting processes to collect/monitor replication check : " + echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n" + echo -en "${idsCL[LightCyan]}Starting processes to collect/monitor replication check : " fi for NTYPE in "${ntypesel[@]}"; do PH=${NTYPE}_HOSTS[0] @@ -52,13 +52,20 @@ STATUS(){ done fi done - [ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Green]}Done${idsCL[Default]}\n" + [ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n" fi ######################## ## LOCALHOST CHECK ######################## if [ "${ST_ACTION}" == "" ] || [ "${ST_ACTION}" == "report" ] || [ "${ST_ACTION}" == "services" ] || [ "${ST_ACTION}" == "dockers" ] || [ "${ST_ACTION}" == "check" ] || [ "${ST_ACTION}" == "all" ]; then + + [ "${ST_ACTION}" != "check" ] && echo -en "${idsCL[LightCyan]}Starting processes to collect node service & docker info : " + for NTYPE in "${ntypesel[@]}"; do + STATUS_NODE ${NTYPE} > ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.running & + done + [ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Green]}Done${idsCL[Default]}\n" + cpu_usage=$(awk '{u=$2+$4; t=$2+$4+$5; if (NR==1){u1=u; t1=t;} else print ($2+$4-u1) * 100 / (t-t1) "%"; }' <(grep 'cpu ' /proc/stat) <(sleep 1;grep 'cpu ' /proc/stat) | sed -e 's/%//g') if [ ! -z ${LOCAL_SERVICES+x} ] && [ "${ST_ACTION}" != "dockers" ]; then @@ -139,13 +146,6 @@ STATUS(){ ## NODE SERVICE AND DOCKER CHECK ################################### - [ "${ST_ACTION}" != "check" ] && echo -en " ${idsCL[LightCyan]}Starting processes to collect node service & docker info : " - for NTYPE in "${ntypesel[@]}"; do - STATUS_NODE ${NTYPE} > ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.running & - done - [ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Green]}Done${idsCL[Default]}\n" - - nc_count=0; completed=false until [ "${completed}" == "true" ]; do for nodestatus in ${STATUSRUN_TMPFOLDER}/status-check.*.done; do