From 9750a1020fff1e33c53c49b2dc4dba24ff164593 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 29 Jan 2019 23:00:48 -0600 Subject: [PATCH] update --- nodemgmt-scripts.sh | 15 ++++++++++++++- run.sh | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index a5384a92..03261e3d 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -96,6 +96,20 @@ case "$1" in status) echo -e "${idsCL[Yellow]} NodeMgmt - Galera/NGINX Node Management${idsCL[Default]} ${idsCL[DarkGray]}(ver-${VERS})${idsCL[Default]}" + if [ ! -z ${LOCAL_SERVICES+x} ]; then + lip=$(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) + echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}" + echo -e "Node: ${idsST[Bold]}${idsCL[LightCyan]}${hostname} (${lip})${idsST[Reset]}${idsCL[LightCyan]} ${LH}${idsCL[Default]}" + for srvc in "${LOCAL_SERVICES[@]}" + do + echo -en "${NM_SERVICES[${srvc}]} " + if [ $(pgrep ${srvc} | wc -l) -gt "0" ]; then + echo -e "${idsCL[Green]}Running${idsCL[Default]}" + else echo -e "${idsCL[Red]}Not Running${idsCL[Default]}" + fi + done + fi + nid=1 for nip in "${NODE_HOSTS[@]}" do @@ -105,7 +119,6 @@ case "$1" in echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}" echo -e "Node: ${idsST[Bold]}${idsCL[LightCyan]}iDS-Node${nid} (${nip})${idsST[Reset]}${idsCL[LightCyan]} ${LH}${idsCL[Default]}" - for srvc in "${NODE_SERVICES[@]}" do echo -en "${NM_SERVICES[${srvc}]} " diff --git a/run.sh b/run.sh index 53ce4dd0..9a306b76 100755 --- a/run.sh +++ b/run.sh @@ -10,7 +10,7 @@ declare -A SERVICES if [ "$1" != "service" ] && [ "$1" != "status-check" ]; then - if [ "$1" != "status" ] && if [ -z ${LOCAL_SERVICES+x} ]; then + if [ "$1" != "status" ]; then echo "" echo -e "${idsCL[Yellow]} NodeMgmt - Galera/NGINX Node Management${idsCL[Default]} ${idsCL[DarkGray]}(ver-${VERS})${idsCL[Default]}" echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}"