From c2052dae1c9dad8ebb5be4ff3046d8cdd0e8731a Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 6 Dec 2023 21:41:43 -0600 Subject: [PATCH] Update status.inc --- inc/status.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/inc/status.inc b/inc/status.inc index 8e5354a4..e8b4c013 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -55,17 +55,19 @@ STATUS(){ [ "${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 & + STATUS_NODE ${NTYPE} > ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.running 2>/dev/null & done [ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n" + ######################## + ## LOCALHOST CHECK + ######################## + 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