Browse Source

make the inital RETVAL consistent

4.0
karl anderson 9 years ago
parent
commit
3be06eb4d0
4 changed files with 4 additions and 11 deletions
  1. +1
    -3
      system/sbin/kazoo-freeswitch
  2. +1
    -4
      system/sbin/kazoo-haproxy
  3. +1
    -2
      system/sbin/kazoo-kamailio
  4. +1
    -2
      system/sbin/kazoo-rabbitmq

+ 1
- 3
system/sbin/kazoo-freeswitch View File

@ -8,7 +8,7 @@ if [ -f /etc/sysconfig/freeswitch ]; then
. /etc/sysconfig/freeswitch . /etc/sysconfig/freeswitch
fi fi
RETVAL=0
RETVAL=1
USER=${FS_USER:-freeswitch} USER=${FS_USER:-freeswitch}
BIN_FILE=${FS_BIN:-/usr/bin/freeswitch} BIN_FILE=${FS_BIN:-/usr/bin/freeswitch}
PID_FILE=${FS_PID:-/var/run/freeswitch/kazoo-freeswitch.pid} 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 if fs_cli -x 'status' > /dev/null 2>&1; then
echo "FreeSWITCH is already running!" echo "FreeSWITCH is already running!"
RETVAL=1
return return
fi fi
@ -112,7 +111,6 @@ case "$1" in
;; ;;
*) *)
echo "Usage: freeswitch {prepare|start|background|stop|restart|status|pause|resume}" echo "Usage: freeswitch {prepare|start|background|stop|restart|status|pause|resume}"
RETVAL=1
;; ;;
esac esac


+ 1
- 4
system/sbin/kazoo-haproxy View File

@ -8,7 +8,7 @@ if [ -f /etc/sysconfig/haproxy ]; then
. /etc/sysconfig/haproxy . /etc/sysconfig/haproxy
fi fi
RETVAL=0
RETVAL=1
USER=${HAPROXY_USER:-haproxy} USER=${HAPROXY_USER:-haproxy}
BIN_FILE=${HAPROXY_BIN:-/usr/sbin/haproxy} BIN_FILE=${HAPROXY_BIN:-/usr/sbin/haproxy}
PID_FILE=${HAPROXY_PID:-/var/run/haproxy/kazoo-haproxy.pid} 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 if echo "show stat" | nc -U /tmp/haproxy.sock > /dev/null 2>&1; then
echo "HAProxy is already running!" echo "HAProxy is already running!"
RETVAL=1
return return
fi 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" 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 if ! echo "show stat" | nc -U /tmp/haproxy.sock > /dev/null 2>&1; then
echo "Unable to connect to HAProxy, ensure it is running!" echo "Unable to connect to HAProxy, ensure it is running!"
RETVAL=1
return return
fi fi
echo -n "|" echo -n "|"
@ -178,7 +176,6 @@ case "$1" in
;; ;;
*) *)
echo $"Usage: $0 {prepare|start|background|stop|restart|status|reload|check|pid}" echo $"Usage: $0 {prepare|start|background|stop|restart|status|reload|check|pid}"
RETVAL=1
esac esac
exit ${RETVAL} exit ${RETVAL}

+ 1
- 2
system/sbin/kazoo-kamailio View File

@ -8,7 +8,7 @@ if [ -f /etc/sysconfig/kamailio ]; then
. /etc/sysconfig/kamailio . /etc/sysconfig/kamailio
fi fi
RETVAL=0
RETVAL=1
USER=${KAMAILIO_USER:-kamailio} USER=${KAMAILIO_USER:-kamailio}
GROUP=${KAMAILIO_GROUP:-kamailio} GROUP=${KAMAILIO_GROUP:-kamailio}
BIN_FILE=${KAMAILIO_BIN:-/usr/sbin/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}" echo $"Usage: $0 {prepare|start|background|stop|restart|status|check|pid}"
RETVAL=1
esac esac
exit ${RETVAL} exit ${RETVAL}

+ 1
- 2
system/sbin/kazoo-rabbitmq View File

@ -4,7 +4,7 @@ if [ -f /etc/default/rabbitmq ]; then
. /etc/default/rabbitmq . /etc/default/rabbitmq
fi fi
RETVAL=0
RETVAL=1
USER=${RABBITMQ_USER-rabbitmq} USER=${RABBITMQ_USER-rabbitmq}
BIN_FILE=${RABBITMQ_BIN:-/usr/lib/rabbitmq/bin/rabbitmq-server} BIN_FILE=${RABBITMQ_BIN:-/usr/lib/rabbitmq/bin/rabbitmq-server}
PID_FILE=${RABBITMQ_PID:-/var/run/rabbitmq/kazoo-rabbitmq.pid} 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 if /usr/lib/rabbitmq/bin/rabbitmqctl status > /dev/null 2>&1; then
echo "RabbitMQ is already running!" echo "RabbitMQ is already running!"
RETVAL=1
return return
fi fi


Loading…
Cancel
Save