From a4f11029f83a348dcc4c1e0cbdd0279cb056c81c Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 29 Nov 2023 15:00:36 -0600
Subject: [PATCH] Update status.inc

---
 inc/status.inc | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/inc/status.inc b/inc/status.inc
index be1574cb..69f8b184 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -227,7 +227,7 @@ STATUS(){
 										SSCHK=false
 										rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.*
 									else
-										SSCHK=true
+										SSCHK=primary
 									fi
 								else
 									SSCHK=true
@@ -235,7 +235,7 @@ STATUS(){
 								
 								[ "${srvc}" == "keepalived" ] && ([ "${nip}" == "10.2.1.2" ] || [ "${nip}" == "10.2.1.51" ]) && NOGOCHK=false
 								
-								if [ ${SSCHK} == true ]; then
+								if [ ${SSCHK} != false ]; then
 									[ "${ST_ACTION}" != "check" ] && echo -en "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: "
 									if [ "${NTYPE}" != "OFW" ]; then
 										srvctest=${srvctst[$sr]}
@@ -292,8 +292,9 @@ STATUS(){
 										fi
 									fi
 									[ "${mysqlgo}" = "true" ] && unset mysqlgo
+									[ "${SSCHK}" == "primary" ] && echo -e "${idsCL[LightCyan]} - Primary Node${idsCL[Default]}" || echo -e "${idsCL[Default]}"
 								else
-									echo -e "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled, not in primary role${idsCL[Default]}"
+									echo -e "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled - Secondary Node${idsCL[Default]}"
 									
 								fi
 								sr=`expr $sr + 1`
@@ -324,12 +325,12 @@ STATUS(){
 										SDCHK=false
 										rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
 									else
-										SDCHK=true
+										SDCHK=primary
 									fi
 								else
 									SDCHK=true
 								fi
-								if [ ${SDCHK} == true ]; then
+								if [ ${SDCHK} != false ]; then
 									[ "${ST_ACTION}" != "check" ] && echo -en "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}$spc${idsCL[Default]}: "
 								
 									if [ ! "$(${NCMD} docker ps -q -f name=${docker})" ]; then
@@ -343,7 +344,7 @@ STATUS(){
 										sleep 10s
 										if [ "$(${NCMD} docker ps -q -f name=${docker})" ]; then
 											if [ "${ST_ACTION}" != "check" ]; then
-												echo -e "${idsCL[Green]}Running - Fixed${idsCL[Default]}"
+												echo -en "${idsCL[Green]}Running - Fixed"
 											fi
 											SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_DOCKER_DESC[${docker}]} is fixed"
 											rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
@@ -351,7 +352,7 @@ STATUS(){
 
 										else
 											if [ "${ST_ACTION}" != "check" ]; then
-												echo -e "${idsCL[Red]}Not Running - Could Not Fix!${idsCL[Default]}"
+												echo -en "${idsCL[Red]}Not Running - Could Not Fix!"
 										
 												if [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.down ]; then
 													SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_DOCKER_DESC[${docker}]} is down, could not fix" 1
@@ -375,12 +376,13 @@ STATUS(){
 										fi
 									else
 										if [ "${ST_ACTION}" != "check" ]; then
-											echo -e "${idsCL[LightGreen]}Running${idsCL[Default]}"
+											echo -en "${idsCL[LightGreen]}Running"
 										fi
 										rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
 									fi
+									[ "${SDCHK}" == "primary" ] && echo -e "${idsCL[LightCyan]} - Primary Node${idsCL[Default]}" || echo -e "${idsCL[Default]}"
 								else
-									echo -e "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled, not in primary role${idsCL[Default]}"
+									echo -e "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled - Secondary Node${idsCL[Default]}"
 								fi
 							done
 						fi