packaging: Don't load rabbitmq-env from init scripts
This was used to define `$RABBITMQ_LOG_BASE`, but this variable is no longer define there. rabbitmq-env would also load `rabbitmq-env.conf` which could redefine `$RABBITMQ_LOG_BASE`, but this is a corner case and doesn't fit packaging well: packages already prepare a location for log files and will clean this location up on removal. Now, we set `$RABBITMQ_LOG_BASE` value in those scripts and get rid of rabbitmq-env load.
This commit is contained in:
parent
ba19ba552b
commit
4b7048205d
|
|
@ -25,7 +25,7 @@ CONTROL=/usr/sbin/rabbitmqctl
|
|||
DESC=rabbitmq-server
|
||||
USER=rabbitmq
|
||||
PID_FILE=/var/run/rabbitmq/pid
|
||||
RABBITMQ_ENV=/usr/lib/rabbitmq/bin/rabbitmq-env
|
||||
RABBITMQ_LOG_BASE=/var/log/rabbitmq
|
||||
|
||||
START_PROG= # Set when building package
|
||||
LOCK_FILE=/var/lock/subsys/$NAME
|
||||
|
|
@ -38,9 +38,6 @@ set -e
|
|||
|
||||
[ -f /etc/default/${NAME} ] && . /etc/default/${NAME}
|
||||
|
||||
RABBITMQ_SCRIPTS_DIR=$(dirname "$RABBITMQ_ENV")
|
||||
. "$RABBITMQ_ENV"
|
||||
|
||||
ensure_pid_dir () {
|
||||
PID_DIR=`dirname ${PID_FILE}`
|
||||
if [ ! -d ${PID_DIR} ] ; then
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ CONTROL=/usr/sbin/rabbitmqctl
|
|||
DESC="message broker"
|
||||
USER=rabbitmq
|
||||
PID_FILE=/var/run/rabbitmq/pid
|
||||
RABBITMQ_ENV=/usr/lib/rabbitmq/bin/rabbitmq-env
|
||||
RABBITMQ_LOG_BASE=/var/log/rabbitmq
|
||||
|
||||
test -x $DAEMON || exit 0
|
||||
test -x $CONTROL || exit 0
|
||||
|
|
@ -33,9 +33,6 @@ set -e
|
|||
|
||||
[ -f /etc/default/${NAME} ] && . /etc/default/${NAME}
|
||||
|
||||
RABBITMQ_SCRIPTS_DIR=$(dirname "$RABBITMQ_ENV")
|
||||
. "$RABBITMQ_ENV"
|
||||
|
||||
. /lib/lsb/init-functions
|
||||
. /lib/init/vars.sh
|
||||
|
||||
|
|
|
|||
|
|
@ -12,12 +12,11 @@
|
|||
## The Original Code is RabbitMQ.
|
||||
##
|
||||
## The Initial Developer of the Original Code is GoPivotal, Inc.
|
||||
## Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved.
|
||||
## Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved.
|
||||
##
|
||||
|
||||
SCRIPT="$(basename "$0")"
|
||||
RABBITMQ_ENV=/usr/lib/rabbitmq/bin/rabbitmq-env
|
||||
RABBITMQ_SCRIPTS_DIR="$(dirname "$RABBITMQ_ENV")"
|
||||
RABBITMQ_LOG_BASE=/var/log/rabbitmq
|
||||
|
||||
main() {
|
||||
ensure_we_are_in_a_readable_dir
|
||||
|
|
@ -72,13 +71,6 @@ calling_rabbitmq_plugins() {
|
|||
}
|
||||
|
||||
exec_rabbitmq_server() {
|
||||
RABBITMQ_ENV=/usr/lib/rabbitmq/bin/rabbitmq-env
|
||||
# RABBITMQ_SCRIPTS_DIR is used in rabbitmq-env
|
||||
# shellcheck disable=SC2034
|
||||
RABBITMQ_SCRIPTS_DIR="$(dirname "$RABBITMQ_ENV")"
|
||||
# shellcheck source=/dev/null
|
||||
. "$RABBITMQ_ENV"
|
||||
|
||||
exec /usr/lib/rabbitmq/bin/rabbitmq-server "$@" @STDOUT_STDERR_REDIRECTION@
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue