[Lunar-commits] <moonbase> rabbitmq-server: Version bumped to 2.8.2

[Stefan Wold]

commit e1d238b1199f32af5176c4fac45e4c270edba7a6
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Sat Jun 16 16:20:41 2012 +0200

    rabbitmq-server: Version bumped to 2.8.2
---
 net/rabbitmq-server/BUILD                  |    6 +++---
 net/rabbitmq-server/DETAILS                |    6 +++---
 net/rabbitmq-server/init.d/rabbitmq-server |   20 +++++++-------------
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/net/rabbitmq-server/BUILD b/net/rabbitmq-server/BUILD
index 8379bd0..69cb7b6 100644
--- a/net/rabbitmq-server/BUILD
+++ b/net/rabbitmq-server/BUILD
@@ -6,9 +6,9 @@
                SBIN_DIR=/usr/lib/rabbitmq/bin \
                MAN_DIR=/usr/share/man &&
 
-  install -p -D -m 0755 $SOURCE_CACHE/$SOURCE2 /usr/sbin/rabbitmqctl &&
-  install -p -D -m 0755 $SOURCE_CACHE/$SOURCE2 /usr/sbin/rabbitmq-server &&
-  install -p -D -m 0755 $SOURCE_CACHE/$SOURCE2 /usr/sbin/rabbitmq-multi &&
+  for i in rabbitmqctl rabbitmq-defaults rabbitmq-env rabbitmq-plugins rabbitmq-server; do
+    install -p -D -m 0755 $SOURCE_CACHE/$SOURCE2 /usr/sbin/$i
+  done &&
   install -o rabbitmq -g rabbitmq -m 750 -d /var/log/rabbitmq &&
   install -o rabbitmq -g rabbitmq -m 750 -d /var/lib/rabbitmq
 
diff --git a/net/rabbitmq-server/DETAILS b/net/rabbitmq-server/DETAILS
index 310716a..4603f1b 100644
--- a/net/rabbitmq-server/DETAILS
+++ b/net/rabbitmq-server/DETAILS
@@ -1,16 +1,16 @@
           MODULE=rabbitmq-server
-         VERSION=2.2.0
+         VERSION=2.8.2
           SOURCE=${MODULE}-${VERSION}.tar.gz
          SOURCE2=rabbitmq-script-wrapper-0.1
       SOURCE_URL=http://www.rabbitmq.com/releases/rabbitmq-server/v${VERSION}
      SOURCE2_URL=$PATCH_URL
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
-      SOURCE_VFY=sha256:3e6b55bbac4dc7b7bf264528dd518b51ab4ab2873cf0f8aceeead386e8e0b0e1
+      SOURCE_VFY=sha256:f8fe9a5d9f9cb0e301f89e26a259aa57c8731e3210d7b8b364ebb5c29f5f6796
      SOURCE2_VFY=sha256:ec31350a636347cef2e3aab097c6b483f20ca3b03cf2c21d08f1179a156cefe5
         WEB_SITE="http://www.rabbitmq.com/"
       MAINTAINER=ratler at lunar-linux.org
          ENTERED=20100919
-         UPDATED=20101205
+         UPDATED=20120616
            SHORT="AMQP, the emerging standard for high performance enterprise messaging"
 cat <<EOF
 RabbitMQ is an implementation of AMQP, the emerging standard for high
diff --git a/net/rabbitmq-server/init.d/rabbitmq-server b/net/rabbitmq-server/init.d/rabbitmq-server
index 1096541..e8c2e0e 100755
--- a/net/rabbitmq-server/init.d/rabbitmq-server
+++ b/net/rabbitmq-server/init.d/rabbitmq-server
@@ -6,26 +6,20 @@
 # description: Enable AMQP service provided by RabbitMQ
 # processname: rabbitmq-multi
 
-DAEMON=/usr/sbin/rabbitmq-multi
 INIT_LOG_DIR=/var/log/rabbitmq
-NODE_COUNT=1
 
 start() {
   echo -n "Starting rabbitmq-server: "
-  $DAEMON start_all ${NODE_COUNT} > ${INIT_LOG_DIR}/startup_log 2> ${INIT_LOG_DIR}/startup_err &&
+  /usr/sbin/rabbitmq-server -detached >> ${INIT_LOG_DIR}/startup_log 2>> ${INIT_LOG_DIR}/startup_err &&
+  /usr/sbin/rabbitmqctl status | sed -n 's/[^p]*pid,\([0-9]*\)[^0-9]*/\1/p' > /var/run/rabbitmq.pid &&
+  /usr/sbin/rabbitmqctl -q wait /var/run/rabbitmq.pid &&
   echo -e "$RESULT_OK" || echo -e "$RESULT_FAIL"
 }
 
 stop() {
-  status_rabbitmq quiet
-  if [ $? = 0 ]; then
-    echo -n "Stopping rabbitmq-server: "
-    $DAEMON stop_all > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err &&
-    echo -e "$RESULT_OK" || echo -e "$RESULT_FAIL"
-  else
-    echo "No nodes running"
-    exit 0
-  fi
+  echo -n "Stopping rabbitmq-server: "
+  /usr/sbin/rabbitmqctl stop >> ${INIT_LOG_DIR}/shutdown_log 2>> ${INIT_LOG_DIR}/shutdown_err &&
+  echo -e "$RESULT_OK" || echo -e "$RESULT_FAIL"
 }
 
 status_rabbitmq() {
@@ -42,7 +36,7 @@ status() {
 
 rotate_logs() {
   echo -n "Rotating rabbitmq-server logs: "
-  $DAEMON rotate_logs &> /dev/null &&
+  /usr/sbin/rabbitmqctl rotate_logs &> /dev/null &&
   echo -e "$RESULT_OK" || echo -e "$RESULT_FAIL"
 }