svn commit: r340614 - in head/net/rabbitmq: . files

[Jimmy Olgeni]

Author: olgeni
Date: Tue Jan 21 15:40:07 2014
New Revision: 340614
URL: http://svnweb.freebsd.org/changeset/ports/340614
QAT: https://qat.redports.org/buildarchive/r340614/

Log:
  - Export HOME before starting RabbitMQ node.
  - After starting, wait for RabbitMQ to be available.
  
  PR:		ports/185962
  Submitted by:	Anes Mukhametov <anes at anes.su>

Modified:
  head/net/rabbitmq/Makefile
  head/net/rabbitmq/files/rabbitmq.in

Modified: head/net/rabbitmq/Makefile
==============================================================================
--- head/net/rabbitmq/Makefile	Tue Jan 21 15:21:27 2014	(r340613)
+++ head/net/rabbitmq/Makefile	Tue Jan 21 15:40:07 2014	(r340614)
@@ -3,7 +3,7 @@
 
 PORTNAME=	rabbitmq
 PORTVERSION=	3.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}

Modified: head/net/rabbitmq/files/rabbitmq.in
==============================================================================
--- head/net/rabbitmq/files/rabbitmq.in	Tue Jan 21 15:21:27 2014	(r340613)
+++ head/net/rabbitmq/files/rabbitmq.in	Tue Jan 21 15:40:07 2014	(r340614)
@@ -35,7 +35,7 @@ extra_commands="rotate_logs status"
 
 rabbitmq_start()
 {
-	HOME=/var/db/rabbitmq
+	export HOME=/var/db/rabbitmq
 	unset ERL_LIBS
 	su -m ${rabbitmq_user} \
 		-c "sh -c \"${rabbitmq_server} -detached\""
@@ -44,6 +44,8 @@ rabbitmq_start()
 	su -m ${rabbitmq_user} \
 		-c "sh -c \"${rabbitmq_ctl} status\"" \
 		| sed -n 's/[^p]*pid,\([0-9]*\)[^0-9]*/\1/p' > ${pidfile}
+# Wait until rabbitmq is up and fully functional
+	$rabbitmq_ctl wait ${pidfile}
 }
 
 run_rc_command "$1"