From c30151189418cfe9fb979a1b31459506c4705026 Mon Sep 17 00:00:00 2001
From: karl anderson <karl@2600hz.com>
Date: Tue, 14 Jun 2016 13:40:59 -0700
Subject: [PATCH] improvements to sbin haproxy script

---
 system/sbin/kazoo-haproxy | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/system/sbin/kazoo-haproxy b/system/sbin/kazoo-haproxy
index 10fa0e0..af7d0fe 100755
--- a/system/sbin/kazoo-haproxy
+++ b/system/sbin/kazoo-haproxy
@@ -26,6 +26,11 @@ start() {
 		RETVAL=1
 		return
 	fi
+	if echo "show stat" | nc -U /tmp/haproxy.sock > /dev/null 2>&1; then
+		echo "HAProxy is already running!"
+		RETVAL=1
+		return
+	fi
 
 	mkdir -p /var/run/haproxy
 	chown -R ${USER} /var/run/haproxy
@@ -34,7 +39,7 @@ start() {
 
 	cd ${HOME}
 	if [ "$(whoami)" == "${USER}" ]; then
-		exec ${BIN_FILE} -f ${CFG_FILE} -p ${PID_FILE} ${OPTIONS} $@
+		exec "${BIN_FILE} -f ${CFG_FILE} -p ${PID_FILE} ${OPTIONS} $@"
 	else
 		exec su -s /bin/bash -c "${BIN_FILE} -f ${CFG_FILE} -p ${PID_FILE} ${OPTIONS} $@" ${USER}
 	fi
@@ -74,7 +79,7 @@ status() {
 	local STATS="pxname svname qcur qmax scur smax slim stot bin bout dreq dresp ereq econ eresp wretr wredis status weight act bck chkfail chdown lastchg downtime qlimit pid iid sid throttle lbtot tracked type rate rate_lim rate_max check_status check_code check_duration hrsp_1xx hrsp_2xx hrsp_3xx hrsp_4xx hrsp_5xx hrsp_other hanafail req_rate req_rate_max req_tot cli_abrt srv_abrt"
 	local TABLE_HEADER="Host|25 Backend|15 Status Active Rate 1xx 2xx 3xx 4xx 5xx Ping"
 	local TABLE_VARS="svname|25 pxname|15 status scur req_rate hrsp_1xx hrsp_2xx hrsp_3xx hrsp_4xx hrsp_5xx check_duration"
-	if ! nc -U /tmp/haproxy.sock &> /dev/null; then
+	if ! echo "show stat" | nc -U /tmp/haproxy.sock > /dev/null 2>&1; then
 		echo "Unable to connect to haproxy, ensure it is running!"
 		RETVAL=1
 		return 1
@@ -124,10 +129,21 @@ status() {
 	done
 }
 
+restart() {
+	stop
+	start
+}
+
 case "$1" in
-	start|stop|restart|reload)
+	start)
 		shift
-		$1 "-D $@"
+		start "-D $@"
+		;;
+	stop)
+		stop
+		;;
+	restart|reload)
+		restart
 		;;
 	foreground)
 		shift