From 256c869f7fa6f75ece74b080255fc08873653004 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 28 Jan 2019 10:13:46 -0600
Subject: [PATCH] Update run.sh

---
 run.sh | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/run.sh b/run.sh
index 73da267b..38bf52c5 100755
--- a/run.sh
+++ b/run.sh
@@ -1,16 +1,47 @@
 #!/usr/bin/env bash
 # NodeMgmt Loader
 
-source /opt/idssys/nodemgmt/settings.conf
 source /opt/idssys/defaults/colors.inc
+source /opt/idssys/defaults/default.inc
 
 VERS=`mysql -h 10.5.10.56 -P 3308 -u sqluser -pdcs2057 -s -N -e "SELECT value FROM idssys.nodemgmt WHERE var = 'VERS'"`
 
 if [ "$1" != "service" ] && [ "$1" != "" ]; then 
+	if [[ $(is_service_running 127.0.0.1 mysql) -gt "1" ]]; then
+		SER_MYSQL="${idsCL[Green]}Running${idsCL[Default]}"
+		else SER_MYSQL="${idsCL[Red]}Not Running${idsCL[Default]}"
+	fi
+	if [[ $(is_service_running 127.0.0.1 haproxy) -gt "1" ]]; then
+		SER_HAP="${idsCL[Green]}Running${idsCL[Default]}"
+		else SER_HAP="${idsCL[Red]}Not Running${idsCL[Default]}"
+	fi
+	if [[ $(is_service_running 127.0.0.1 nginx) -gt "1" ]]; then
+		SER_NGINX="${idsCL[Green]}Running${idsCL[Default]}"
+		else SER_NGINX="${idsCL[Red]}Not Running${idsCL[Default]}"
+	fi
+	if [[ $(is_service_running 127.0.0.1 keepalived) -gt "1" ]]; then
+		SER_KA="${idsCL[Green]}Running${idsCL[Default]}"
+		else SER_KA="${idsCL[Red]}Not Running${idsCL[Default]}"
+	fi
+	if [[ $(is_service_running 127.0.0.1 gogs) -gt "1" ]]; then
+		SER_GOGS="${idsCL[Green]}Running${idsCL[Default]}"
+		else SER_GOGS="${idsCL[Red]}Not Running${idsCL[Default]}"
+	fi
+	if [[ $(is_service_running 127.0.0.1 maxscale) -gt "1" ]]; then
+		SER_MS="${idsCL[Green]}Running${idsCL[Default]}"
+		else SER_MS="${idsCL[Red]}Not Running${idsCL[Default]}"
+	fi
+	
 	echo ""
 	echo -e "${idsCL[Yellow]} NodeMgmt - Galera/NGINX Node Management${idsCL[Default]}  ${idsCL[DarkGray]}(ver-${VERS})${idsCL[Default]}"
 	echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}"
-	echo -e "Node hostname:   ${node_hostname}"
+	echo -e "Node hostname:	${node_hostname}"
+	echo -e "MySQL:			${SER_MYSQL}"
+	echo -e "NGINX:			${SER_NGINX}"
+	echo -e "Gogs:			${SER_GOGS}"
+	echo -e "HAProxy:		${SER_HAP}"
+	echo -e "Keepalived:	${SER_KA}"
+	echo -e "MaxScale:		${SER_MS}"
 	echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}"
 	echo ""
 	if [ "$1" = "update" ]; then echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}"