Accepting request 145495 from home:rhafer:branches:network:messaging:amqp

some init script and sysconfig cleanup, add OCF RA for use with pacemaker

OBS-URL: https://build.opensuse.org/request/show/145495
OBS-URL: https://build.opensuse.org/package/show/network:messaging:amqp/rabbitmq-server?expand=0&rev=12

rabbitmq-server.init

@@ -16,6 +16,11 @@
 # Short-Description: Enable AMQP service provided by RabbitMQ broker
 ### END INIT INFO
 
+# Source function library
+. /etc/rc.status
+
+rc_reset
+
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 NAME=rabbitmq-server
 DAEMON=/usr/sbin/${NAME}
@@ -43,24 +48,17 @@ fi
 mkdir -p /var/run/rabbitmq
 chown rabbitmq. /var/run/rabbitmq
 
-RETVAL=0
-set -e
-
 start_rabbitmq () {
     status_rabbitmq quiet
-    if [ $RETVAL = 0 ] ; then
-        echo RabbitMQ is currently running
+    if [ $? -eq 0 ] ; then
+        return 0
     else
-        RETVAL=0
-        set +e
         setsid sh -c "RABBITMQ_PID_FILE=$PID_FILE $DAEMON > \
             ${INIT_LOG_DIR}/startup_log 2> ${INIT_LOG_DIR}/startup_err" &
         $CONTROL wait $PID_FILE >/dev/null 2>&1
-        RETVAL=$?
-        set -e
-        case "$RETVAL" in
+        rc=$?
+        case "$rc" in
             0)
-                echo SUCCESS
                 if [ -n "$LOCK_FILE" ] ; then
                     touch $LOCK_FILE
                 fi
@@ -68,20 +66,19 @@ start_rabbitmq () {
             *)
                 rm -f $PID_FILE
                 echo FAILED - check ${INIT_LOG_DIR}/startup_\{log, _err\}
-                RETVAL=1
+                rc=1
                 ;;
         esac
     fi
+    return $rc
 }
 
 stop_rabbitmq () {
     status_rabbitmq quiet
-    if [ $RETVAL = 0 ] ; then
-        set +e
+    if [ $? -eq 0 ] ; then
         $CONTROL stop > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err
-        RETVAL=$?
-        set -e
-        if [ $RETVAL = 0 ] ; then
+        rc=$?
+        if [ $rc -eq 0 ] ; then
             rm -f $PID_FILE
             if [ -n "$LOCK_FILE" ] ; then
                 rm -f $LOCK_FILE
@@ -90,80 +87,79 @@ stop_rabbitmq () {
             echo FAILED - check ${INIT_LOG_DIR}/shutdown_log, _err
         fi
     else
-        echo RabbitMQ is not running
-        RETVAL=0
+        rc=0
     fi
+    return $rc
 }
 
 status_rabbitmq() {
-    set +e
+    rc=0
     if [ "$1" != "quiet" ] ; then
         $CONTROL status 2>&1
     else
         $CONTROL status > /dev/null 2>&1
     fi
-    if [ $? != 0 ] ; then
-        RETVAL=3
+    if [ $? -ne 0 ] ; then
+        rc=3
     fi
-    set -e
+    return $rc
 }
 
 rotate_logs_rabbitmq() {
-    set +e
+    rc=0
     $CONTROL rotate_logs ${ROTATE_SUFFIX}
     if [ $? != 0 ] ; then
-        RETVAL=1
+        rc=1
     fi
-    set -e
+    return $rc
 }
 
 restart_running_rabbitmq () {
     status_rabbitmq quiet
-    if [ $RETVAL = 0 ] ; then
+    if [ $? -eq 0 ] ; then
         restart_rabbitmq
     else
         echo RabbitMQ is not runnning
-        RETVAL=0
     fi
 }
 
 restart_rabbitmq() {
-    stop_rabbitmq
-    start_rabbitmq
+    $0 stop
+    $0 start
 }
 
 case "$1" in
     start)
         echo -n "Starting $DESC: "
         start_rabbitmq
-        echo "$NAME."
+        rc_status -v
         ;;
     stop)
         echo -n "Stopping $DESC: "
         stop_rabbitmq
-        echo "$NAME."
+        rc_status -v
         ;;
     status)
         status_rabbitmq
+        rc_status # no verbose here -- status function already prints status out
         ;;
     rotate-logs)
         echo -n "Rotating log files for $DESC: "
         rotate_logs_rabbitmq
+        rc_status
         ;;
     force-reload|reload|restart)
-        echo -n "Restarting $DESC: "
         restart_rabbitmq
-        echo "$NAME."
+        rc_status
         ;;
     condrestart|try-restart)
-        echo -n "Restarting $DESC: "
         restart_running_rabbitmq
-        echo "$NAME."
+        rc_status
         ;;
     *)
         echo "Usage: $0 {start|stop|status|rotate-logs|restart|condrestart|try-restart|reload|force-reload}" >&2
-        RETVAL=1
+        exit 1
         ;;
 esac
 
-exit $RETVAL
+rc_exit