diff --git a/system/sbin/kazoo-haproxy b/system/sbin/kazoo-haproxy index 7c42a39..e0ac3f8 100755 --- a/system/sbin/kazoo-haproxy +++ b/system/sbin/kazoo-haproxy @@ -13,8 +13,16 @@ USER=${HAPROXY_USER:-root} BIN_FILE=${HAPROXY_BIN:-/usr/sbin/haproxy} PID_FILE=${HAPROXY_PID:-/var/run/haproxy/kazoo-haproxy.pid} CFG_FILE=${HAPROXY_CONFIG:-/etc/kazoo/haproxy/haproxy.cfg} +SOCKET=${HAPROXY_SOCKET:-/var/run/haproxy/haproxy.sock} export HOME=${HAPROXY_HOME:-/var/lib/haproxy} +check_socket() { + if [ -S "$SOCKET" ]; then + return + fi + SOCKET=/tmp/haproxy.sock +} + prepare() { mkdir -p /var/log/haproxy chown -R ${USER} /var/log/haproxy @@ -34,7 +42,7 @@ start() { return fi - if echo "show stat" | nc -U /var/run/haproxy/haproxy.sock > /dev/null 2>&1; then + if echo "show stat" | nc -U $SOCKET > /dev/null 2>&1; then echo "HAProxy is already running!" return fi @@ -72,7 +80,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 ! echo "show stat" | nc -U /var/run/haproxy/haproxy.sock > /dev/null 2>&1; then + if ! echo "show stat" | nc -U $SOCKET > /dev/null 2>&1; then echo "Unable to connect to HAProxy, ensure it is running!" return fi @@ -88,7 +96,7 @@ status() { printf "%-${SIZE}s |" $NAME done echo - echo "show stat" | nc -U /var/run/haproxy/haproxy.sock \ + echo "show stat" | nc -U $SOCKET \ | while IFS=',' read ${STATS}; do if [ -z "$svname" ]; then continue @@ -146,6 +154,7 @@ pid() { RETVAL=$? } +check_socket case "$1" in prepare) prepare