diff options
| author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2015-12-30 22:44:36 +0000 |
|---|---|---|
| committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2015-12-30 22:44:36 +0000 |
| commit | bfde8c03da7abd46af65ba2196e890d075549277 (patch) | |
| tree | 16163ee48ce76508250392991a6810acfef78f77 /net/rabbitmq | |
| parent | 65916dbc3ce6df63f479a27da158d6500b9887d2 (diff) | |
Notes
Diffstat (limited to 'net/rabbitmq')
| -rw-r--r-- | net/rabbitmq/Makefile | 1 | ||||
| -rw-r--r-- | net/rabbitmq/files/rabbitmq.in | 32 |
2 files changed, 9 insertions, 24 deletions
diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile index e7c08f35ffc9..91a9a5ad60b4 100644 --- a/net/rabbitmq/Makefile +++ b/net/rabbitmq/Makefile @@ -3,6 +3,7 @@ PORTNAME= rabbitmq PORTVERSION= 3.5.7 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/ DISTNAME= ${PORTNAME}-server-${PORTVERSION} diff --git a/net/rabbitmq/files/rabbitmq.in b/net/rabbitmq/files/rabbitmq.in index ea4b863d45cc..528bb035f5bc 100644 --- a/net/rabbitmq/files/rabbitmq.in +++ b/net/rabbitmq/files/rabbitmq.in @@ -25,6 +25,7 @@ load_rc_config $name rabbitmq_server="%%PREFIX%%/sbin/rabbitmq-server" rabbitmq_ctl="%%PREFIX%%/sbin/rabbitmqctl" pidfile="/var/run/${name}.pid" +daemon_pidfile="/var/run/${name}-daemon.pid" start_cmd="${name}_start" stop_cmd="${name}_stop" @@ -46,35 +47,18 @@ rabbitmq_start() chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_HOME} fi - env HOME=${RABBITMQ_HOME} daemon -c -f -u ${rabbitmq_user} -p ${pidfile} ${rabbitmq_server} - - local _attempt=10 - - while [ ${_attempt} -gt 0 ]; do - debug "Running: rabbitmqctl status (${_attempt})" - $rabbitmq_ctl status > /dev/null 2>&1 && break - _attempt=$((${_attempt} - 1)) - sleep 1 - done - - if [ ${_attempt} -gt 0 ]; then - debug "Running: rabbitmqctl wait ${pidfile}" - $rabbitmq_ctl wait ${pidfile} >/dev/null 2>&1 - fi + env HOME=${RABBITMQ_HOME} daemon -c -f -u ${rabbitmq_user} -p ${pidfile} -P ${daemon_pidfile} ${rabbitmq_server} + debug "Running: rabbitmqctl wait ${pidfile}" + ${rabbitmq_ctl} wait ${pidfile} >/dev/null 2>&1 } rabbitmq_stop() { echo "Stopping ${name}." - - debug "Running: ${rabbitmq_ctl} stop" - - su -m ${rabbitmq_user} -c "sh -c \"${rabbitmq_ctl} stop\"" >/dev/null 2>&1 - - if [ -f ${pidfile} ]; then - read rc_pid < ${pidfile} - wait_for_pids $rc_pid - fi + [ -f ${daemon_pidfile} ] && read daemon_pid < ${daemon_pidfile} + debug "Running: ${rabbitmq_ctl} stop ${pidfile}" + su -m ${rabbitmq_user} -c "sh -c \"${rabbitmq_ctl} stop ${pidfile}\"" >/dev/null 2>&1 + [ -n "${daemon_pid}" ] && wait_for_pids ${daemon_pid} } run_rc_command "$1" |