From 3be06eb4d0c6fd62c879868863441f677615877d Mon Sep 17 00:00:00 2001 From: karl anderson Date: Fri, 30 Sep 2016 15:55:24 -0700 Subject: [PATCH] make the inital RETVAL consistent --- system/sbin/kazoo-freeswitch | 4 +--- system/sbin/kazoo-haproxy | 5 +---- system/sbin/kazoo-kamailio | 3 +-- system/sbin/kazoo-rabbitmq | 3 +-- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/system/sbin/kazoo-freeswitch b/system/sbin/kazoo-freeswitch index 0aefbce..b62cda6 100755 --- a/system/sbin/kazoo-freeswitch +++ b/system/sbin/kazoo-freeswitch @@ -8,7 +8,7 @@ if [ -f /etc/sysconfig/freeswitch ]; then . /etc/sysconfig/freeswitch fi -RETVAL=0 +RETVAL=1 USER=${FS_USER:-freeswitch} BIN_FILE=${FS_BIN:-/usr/bin/freeswitch} PID_FILE=${FS_PID:-/var/run/freeswitch/kazoo-freeswitch.pid} @@ -38,7 +38,6 @@ start() { if fs_cli -x 'status' > /dev/null 2>&1; then echo "FreeSWITCH is already running!" - RETVAL=1 return fi @@ -112,7 +111,6 @@ case "$1" in ;; *) echo "Usage: freeswitch {prepare|start|background|stop|restart|status|pause|resume}" - RETVAL=1 ;; esac diff --git a/system/sbin/kazoo-haproxy b/system/sbin/kazoo-haproxy index 95241c2..4af3b35 100755 --- a/system/sbin/kazoo-haproxy +++ b/system/sbin/kazoo-haproxy @@ -8,7 +8,7 @@ if [ -f /etc/sysconfig/haproxy ]; then . /etc/sysconfig/haproxy fi -RETVAL=0 +RETVAL=1 USER=${HAPROXY_USER:-haproxy} BIN_FILE=${HAPROXY_BIN:-/usr/sbin/haproxy} PID_FILE=${HAPROXY_PID:-/var/run/haproxy/kazoo-haproxy.pid} @@ -35,7 +35,6 @@ start() { if echo "show stat" | nc -U /tmp/haproxy.sock > /dev/null 2>&1; then echo "HAProxy is already running!" - RETVAL=1 return fi @@ -74,7 +73,6 @@ status() { 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 /tmp/haproxy.sock > /dev/null 2>&1; then echo "Unable to connect to HAProxy, ensure it is running!" - RETVAL=1 return fi echo -n "|" @@ -178,7 +176,6 @@ case "$1" in ;; *) echo $"Usage: $0 {prepare|start|background|stop|restart|status|reload|check|pid}" - RETVAL=1 esac exit ${RETVAL} diff --git a/system/sbin/kazoo-kamailio b/system/sbin/kazoo-kamailio index 2411fd0..be8ca1f 100755 --- a/system/sbin/kazoo-kamailio +++ b/system/sbin/kazoo-kamailio @@ -8,7 +8,7 @@ if [ -f /etc/sysconfig/kamailio ]; then . /etc/sysconfig/kamailio fi -RETVAL=0 +RETVAL=1 USER=${KAMAILIO_USER:-kamailio} GROUP=${KAMAILIO_GROUP:-kamailio} BIN_FILE=${KAMAILIO_BIN:-/usr/sbin/kamailio} @@ -118,7 +118,6 @@ case "$1" in ;; *) echo $"Usage: $0 {prepare|start|background|stop|restart|status|check|pid}" - RETVAL=1 esac exit ${RETVAL} diff --git a/system/sbin/kazoo-rabbitmq b/system/sbin/kazoo-rabbitmq index 92de63b..0a75fe0 100755 --- a/system/sbin/kazoo-rabbitmq +++ b/system/sbin/kazoo-rabbitmq @@ -4,7 +4,7 @@ if [ -f /etc/default/rabbitmq ]; then . /etc/default/rabbitmq fi -RETVAL=0 +RETVAL=1 USER=${RABBITMQ_USER-rabbitmq} BIN_FILE=${RABBITMQ_BIN:-/usr/lib/rabbitmq/bin/rabbitmq-server} PID_FILE=${RABBITMQ_PID:-/var/run/rabbitmq/kazoo-rabbitmq.pid} @@ -41,7 +41,6 @@ start() { if /usr/lib/rabbitmq/bin/rabbitmqctl status > /dev/null 2>&1; then echo "RabbitMQ is already running!" - RETVAL=1 return fi