FreeBSD Bugzilla – Attachment 227890 Details for
Bug 258488
net/rabbitmq: fix pidfile in rabbitmq rc.d script
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
net/rabbitmq: fix pidfile in rabbitmq rc.d script
rabbitmq-1.diff (text/plain), 1.50 KB, created by
Oleg Ginzburg
on 2021-09-14 06:29:21 UTC
(
hide
)
Description:
net/rabbitmq: fix pidfile in rabbitmq rc.d script
Filename:
MIME Type:
Creator:
Oleg Ginzburg
Created:
2021-09-14 06:29:21 UTC
Size:
1.50 KB
patch
obsolete
>diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile >index 08b2790c7..72d0f6e8e 100644 >--- a/net/rabbitmq/Makefile >+++ b/net/rabbitmq/Makefile >@@ -2,6 +2,7 @@ > > PORTNAME= rabbitmq > DISTVERSION= 3.9.5 >+PORTVERSION= 1 > CATEGORIES= net > MASTER_SITES= https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PORTVERSION}/ > DISTNAME= ${PORTNAME}-server-${PORTVERSION} >diff --git a/net/rabbitmq/files/rabbitmq.in b/net/rabbitmq/files/rabbitmq.in >index 0e0024484..03fa39791 100644 >--- a/net/rabbitmq/files/rabbitmq.in >+++ b/net/rabbitmq/files/rabbitmq.in >@@ -24,6 +24,7 @@ rabbitmq_server="%%PREFIX%%/sbin/rabbitmq-server" > rabbitmq_ctl="%%PREFIX%%/sbin/rabbitmqctl" > rabbitmq_env_conf="%%PREFIX%%/etc/rabbitmq/rabbitmq-env.conf" > pidfile="/var/run/${name}.pid" >+daemon_pidfile="/var/run/${name}-daemon.pid" > > start_cmd="${name}_start" > stop_cmd="${name}_stop" >@@ -66,9 +67,7 @@ rabbitmq_start() > > install -o ${rabbitmq_user} /dev/null ${pidfile} > >- debug "Running: rabbitmq-server -detached" >- su -m ${rabbitmq_user} -c "${rabbitmq_server} -detached" >/dev/null 2>&1 >- debug "Running: rabbitmqctl wait ${pidfile}" >+ env HOME=${RABBITMQ_HOME} /usr/sbin/daemon -c -f -u ${rabbitmq_user} -p ${pidfile} -P ${daemon_pidfile} ${rabbitmq_server} > su -m ${rabbitmq_user} -c "${rabbitmq_ctl} wait ${pidfile}" >/dev/null 2>&1 > } > >@@ -82,7 +81,7 @@ rabbitmq_stop() > debug "Running: ${rabbitmq_ctl} shutdown" > su -m ${rabbitmq_user} -c "${rabbitmq_ctl} shutdown" >/dev/null 2>&1 > fi >+ return 0 > } > > run_rc_command "$1" >-
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 258488
:
227887
| 227890