Added status command to rabbit_mutli, init.d scripts

now use that command.
Used status command in init.d scripts to check
if the server is running before stopping it.
Fixed various indentation problems in init.d scripts.
Synchronized the init.d in Debian and RPM to behave
in a similar way.

1 files changed, 69 insertions, 39 deletions

diff --git a/packaging/debs/Debian/debian/init.d b/packaging/debs/Debian/debian/init.d
index da9d70f2e4..a93f306692 100644
--- a/packaging/debs/Debian/debian/init.d
+++ b/packaging/debs/Debian/debian/init.d
@@ -29,26 +29,50 @@ set -e
 cd /
 
 start_rabbitmq () {
-      set +e
-      su $USER -s /bin/sh -c "$DAEMON start_all ${NODE_COUNT}" > /var/log/rabbitmq/startup_log 2> /var/log/rabbitmq/startup_err
-      case "$?" in
-        0)
-          echo SUCCESS;;
-        1)
-          echo TIMEOUT - check /var/log/rabbitmq/startup_\{log,err\};;
-        *)
-          echo FAILED - check /var/log/rabbitmq/startup_log, _err
-          exit 1;;
-      esac 
-      set -e
+    set +e
+    su $USER -s /bin/sh -c "$DAEMON start_all ${NODE_COUNT}" > /var/log/rabbitmq/startup_log 2> /var/log/rabbitmq/startup_err
+    case "$?" in
+      0)
+        echo SUCCESS
+        RETVAL=0
+        ;;
+      1)
+        echo TIMEOUT - check /var/log/rabbitmq/startup_\{log,err\}
+        RETVAL=1
+        ;;
+      *)
+        echo FAILED - check /var/log/rabbitmq/startup_log, _err
+        RETVAL=1
+        ;;
+    esac
+    set -e
 }
 
 stop_rabbitmq () {
     set +e
-    su $USER -s /bin/sh -c "$DAEMON stop_all" > /var/log/rabbitmq/shutdown_log 2> /var/log/rabbitmq/shutdown_err
+    status_rabbitmq quiet
+    if [ $RETVAL == 0 ] ; then
+        su $USER -s /bin/sh -c "$DAEMON stop_all" > /var/log/rabbitmq/shutdown_log 2> /var/log/rabbitmq/shutdown_err
+        RETVAL=$?
+        if [ $RETVAL != 0 ] ; then
+            echo FAILED - check /var/log/rabbitmq/shutdown_log, _err
+        fi
+    else
+        echo No nodes running 
+        RETVAL=0
+    fi
+    set -e
+}
+
+status_rabbitmq() {
+    set +e
+    if [ "$1" != "quiet" ] ; then
+        su $USER -s /bin/sh -c "$DAEMON status" 2>&1
+    else
+        su $USER -s /bin/sh -c "$DAEMON status" > /dev/null 2>&1
+    fi
     if [ $? != 0 ] ; then
-        echo FAILED - check /var/log/rabbitmq/shutdown_log, _err
-        exit 0
+        RETVAL=1
     fi
     set -e
 }
@@ -57,34 +81,40 @@ rotate_logs_rabbitmq() {
     set +e
     su $USER -s /bin/sh -c "$DAEMON rotate_logs ${ROTATE_SUFFIX}" 2>&1
     set -e
+}
 
+restart_rabbitmq() {
+    stop_rabbitmq	    
+    start_rabbitmq
 }
 
 case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-	start_rabbitmq
-	echo "$NAME."
-	;;
-  stop)
-	echo -n "Stopping $DESC: "
-	stop_rabbitmq
-	echo "$NAME."
-	;;
-  rotate-logs)
-    echo -n "Rotating log files for $DESC: "
-    rotate_logs_rabbitmq
-    ;;
-  force-reload|restart)
-	echo -n "Restarting $DESC: "
-	stop_rabbitmq
-	start_rabbitmq
-	echo "$NAME."
-	;;
-  *)
-	echo "Usage: $0 {start|stop|rotate-logs|restart|force-reload}" >&2
-	RETVAL=1
-	;;
+    start)
+        echo -n "Starting $DESC: "
+        start_rabbitmq
+        echo "$NAME."
+        ;;
+    stop)
+        echo -n "Stopping $DESC: "
+        stop_rabbitmq
+        echo "$NAME."
+        ;;
+    status)
+        status_rabbitmq
+        ;;
+    rotate-logs)
+        echo -n "Rotating log files for $DESC: "
+        rotate_logs_rabbitmq
+        ;;
+    force-reload|restart)
+        echo -n "Restarting $DESC: "
+        restart_rabbitmq
+        echo "$NAME."
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|status|rotate-logs|restart|force-reload}" >&2
+        RETVAL=1
+        ;;
 esac
 
 exit $RETVAL