Merge lp:~kalebral-deactivatedaccount/drizzle/705699 into lp:drizzle/7.0

[Lee Bieber]

Fixes first part of 705699, don't sudo to start and stop rabbitmq server

[Monty Taylor (mordred)]

Looks good.

review: Approve

[lp:~kalebral-deactivatedaccount/drizzle/705699]

2103. By Lee Bieber <email address hidden> on 2011-01-24

Fixes second part of the bug, don't build the plugin unless you have both the client and the server

=== modified file 'plugin/rabbitmq/admin.sh'
--- plugin/rabbitmq/admin.sh	2011-01-12 23:00:17 +0000
+++ plugin/rabbitmq/admin.sh	2011-01-24 23:11:40 +0000
@@ -34,14 +34,26 @@
 export RABBITMQ_NODENAME="drizzle_test"
 export RABBITMQ_NODE_IP_ADDRESS="0.0.0.0"
 
+DIR=$RABBITMQ_NODENAME
+rm -rf $DIR
+mkdir -p $DIR/logs
+mkdir $DIR/mnesia
+
+export RABBITMQ_MNESIA_BASE="`pwd`/$DIR/mnesia"
+export RABBITMQ_LOG_BASE="`pwd`/$DIR/logs"
+
+
 startup()
 {
-  /usr/sbin/rabbitmq-server -detached
+   /usr/lib/rabbitmq/bin/rabbitmq-server -detached
+   sleep 5
 }
 
 shutdown()
 {
-  /usr/sbin/rabbitmqctl stop
+  /usr/lib/rabbitmq/bin/rabbitmqctl -q -n $RABBITMQ_NODENAME stop
+  sleep 5
+  rm -rf $DIR
 }
 
 restart()

=== modified file 'plugin/rabbitmq/plugin.ac'
--- plugin/rabbitmq/plugin.ac	2010-02-06 20:18:39 +0000
+++ plugin/rabbitmq/plugin.ac	2011-01-24 23:11:40 +0000
@@ -13,6 +13,7 @@
   [
 amqp_new_connection();
 ])
-AS_IF([test "$ac_cv_librabbitmq" = "no"],
- [AC_MSG_WARN([Couldn't find rabbitmq c client support, rabbitmq log will not be built.])])
+AC_PATH_PROG([RABBITMQ_BINARY],[rabbitmq-server],[no],[/usr/sbin:$PATH])
+AS_IF([test "$ac_cv_librabbitmq" = "no" -o "x${RABBITMQ_BINARY}" = "xno"],
+ [AC_MSG_WARN([Couldn't find both rabbitmq c client and server support, rabbitmq plugin will not be built.])])
 

=== modified file 'plugin/rabbitmq/tests/t/variables-master.sh'
--- plugin/rabbitmq/tests/t/variables-master.sh	2011-01-14 06:36:12 +0000
+++ plugin/rabbitmq/tests/t/variables-master.sh	2011-01-24 23:11:40 +0000
@@ -1,9 +1,4 @@
 #! /bin/sh
 
-echo "RABBITMQ_NODE_ PORT = $RABBITMQ_NODE_PORT"
-echo "Stopping rabbitmq"
-sudo -E $TOP_SRCDIR/plugin/rabbitmq/admin.sh stop
-sleep 5
-echo "Starting rabbitmq"
-sudo -E $TOP_SRCDIR/plugin/rabbitmq/admin.sh start
-sleep 5
+$TOP_SRCDIR/plugin/rabbitmq/admin.sh stop
+$TOP_SRCDIR/plugin/rabbitmq/admin.sh start

=== modified file 'plugin/rabbitmq/tests/t/variables.test'
--- plugin/rabbitmq/tests/t/variables.test	2010-09-22 14:17:17 +0000
+++ plugin/rabbitmq/tests/t/variables.test	2011-01-24 23:11:40 +0000
@@ -1,1 +1,3 @@
 SELECT * FROM data_dictionary.modules WHERE module_name = 'rabbitmq';
+
+--exec $TOP_SRCDIR/plugin/rabbitmq/admin.sh stop