Be consistent about attempting to remove the directory whenever we can; remove purge deletion of var/run which has existed since root of hg repo.

Author: Matthew Sackman

packaging/common/rabbitmq-server.init

@@ -43,6 +43,11 @@ ensure_pid_dir () {
     fi
 }
 
+remove_pid () {
+    rm -f ${PID_FILE}
+    rmdir `dirname ${PID_FILE}` || :
+}
+
 start_rabbitmq () {
     status_rabbitmq quiet
     if [ $RETVAL = 0 ] ; then
@@ -64,7 +69,7 @@ start_rabbitmq () {
                 fi
                 ;;
             *)
-                rm -f $PID_FILE
+                remove_pid
                 echo FAILED - check ${INIT_LOG_DIR}/startup_\{log, _err\}
                 RETVAL=1
                 ;;
@@ -80,7 +85,7 @@ stop_rabbitmq () {
         RETVAL=$?
         set -e
         if [ $RETVAL = 0 ] ; then
-            rm -rf `dirname $PID_FILE`
+            remove_pid
             if [ -n "$LOCK_FILE" ] ; then
                 rm -f $LOCK_FILE
             fi

packaging/common/rabbitmq-server.ocf

@@ -189,6 +189,11 @@ ensure_pid_dir () {
     return $OCF_SUCCESS
 }
 
+remove_pid () {
+    rm -f ${RABBITMQ_PID_FILE}
+    rmdir `dirname ${RABBITMQ_PID_FILE}` || :
+}
+
 export_vars() {
     [ ! -z $RABBITMQ_NODE_IP_ADDRESS ]     && export RABBITMQ_NODE_IP_ADDRESS
     [ ! -z $RABBITMQ_NODE_PORT ]           && export RABBITMQ_NODE_PORT
@@ -278,7 +283,7 @@ rabbit_start() {
     rabbit_wait $RABBITMQ_PID_FILE
     rc=$?
     if [ "$rc" != $OCF_SUCCESS ]; then
-        rm -f $RABBITMQ_PID_FILE
+        remove_pid
         ocf_log info "rabbitmq-server start failed: $rc"
         exit $OCF_ERR_GENERIC
     fi
@@ -309,7 +314,7 @@ rabbit_stop() {
         rabbit_status
         rc=$?
         if [ "$rc" = $OCF_NOT_RUNNING ]; then
-            rm -rf `dirname ${RABBITMQ_PID_FILE}`
+            remove_pid
             stop_wait=0
             break
         elif [ "$rc" != $OCF_SUCCESS ]; then

packaging/debs/Debian/debian/postrm.in

@@ -32,9 +32,6 @@ case "$1" in
         if [ -d /var/log/rabbitmq ]; then
                 rm -r /var/log/rabbitmq
         fi
-        if [ -d /var/run/rabbitmq ]; then
-                rm -r /var/run/rabbitmq
-        fi
         if [ -d /etc/rabbitmq ]; then
                 rm -r /etc/rabbitmq
         fi