diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-04-03 16:27:04 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-04-03 17:27:40 +0200 |
| commit | 797ee7fa0794f60d96fa7c5bf780853b78de2ef3 (patch) | |
| tree | c590abf7622d414d94768e4d7b9a348277db8366 /packaging/debs | |
| parent | c5a3e04772d281386cb7a90e4bf2c8a15ed43000 (diff) | |
| download | rabbitmq-server-git-797ee7fa0794f60d96fa7c5bf780853b78de2ef3.tar.gz | |
Init scripts: Honor RABBITMQ_LOG_BASE for {startup,shutdown}_* location
Before this change, they were written to /var/log/rabbitmq, no matter
the value of RABBITMQ_LOG_BASE.
In rabbitmq-env, allow the caller to set RABBITMQ_SCRIPTS_DIR to the
directory where rabbitmq-env and rabbitmq-default are located.
In both Fedora and Debian rabbitmq-server.init and
rabbitmq-script-wrapper, load rabbitmq-env and use RABBITMQ_LOG_BASE.
The default value is /var/log/rabbitmq, so the default behaviour remains
the same.
In Debian's rabbitmq-script-wrapper version, use RABBITMQ_LOG_BASE
instead of the hard-coded /var/log/rabbitmq.
Fixes #88.
Diffstat (limited to 'packaging/debs')
| -rw-r--r-- | packaging/debs/Debian/Makefile | 2 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/rabbitmq-server.init | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile index 6d844364c9..354f091872 100644 --- a/packaging/debs/Debian/Makefile +++ b/packaging/debs/Debian/Makefile @@ -23,7 +23,7 @@ package: clean cp -r debian $(UNPACKED_DIR) cp $(COMMON_DIR)/* $(UNPACKED_DIR)/debian/ sed -i -e 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' \ - -e 's|@STDOUT_STDERR_REDIRECTION@| > "/var/log/rabbitmq/startup_log" 2> "/var/log/rabbitmq/startup_err"|' \ + -e 's|@STDOUT_STDERR_REDIRECTION@|> "$$RABBITMQ_LOG_BASE/startup_log" 2> "$$RABBITMQ_LOG_BASE/startup_err"|' \ $(UNPACKED_DIR)/debian/rabbitmq-script-wrapper chmod a+x $(UNPACKED_DIR)/debian/rules echo "This package was debianized by Tony Garnock-Jones <tonyg@rabbitmq.com> on\nWed, 3 Jan 2007 15:43:44 +0000.\n\nIt was downloaded from http://www.rabbitmq.com/\n\n" > $(UNPACKED_DIR)/debian/copyright diff --git a/packaging/debs/Debian/debian/rabbitmq-server.init b/packaging/debs/Debian/debian/rabbitmq-server.init index b2d3f86ab3..3bdff8e66f 100644 --- a/packaging/debs/Debian/debian/rabbitmq-server.init +++ b/packaging/debs/Debian/debian/rabbitmq-server.init @@ -23,9 +23,8 @@ CONTROL=/usr/sbin/rabbitmqctl DESC="message broker" USER=rabbitmq ROTATE_SUFFIX= -INIT_LOG_DIR=/var/log/rabbitmq PID_FILE=/var/run/rabbitmq/pid - +RABBITMQ_ENV=/usr/lib/rabbitmq/bin/rabbitmq-env test -x $DAEMON || exit 0 test -x $CONTROL || exit 0 @@ -35,6 +34,9 @@ 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 @@ -76,7 +78,9 @@ stop_rabbitmq () { status_rabbitmq quiet if [ $RETVAL = 0 ] ; then set +e - $CONTROL stop ${PID_FILE} > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err + $CONTROL stop ${PID_FILE} \ + > ${RABBITMQ_LOG_BASE}/shutdown_log \ + 2> ${RABBITMQ_LOG_BASE}/shutdown_err RETVAL=$? set -e if [ $RETVAL = 0 ] ; then @@ -143,7 +147,7 @@ start_stop_end() { RETVAL=0 ;; *) - log_warning_msg "FAILED - check ${INIT_LOG_DIR}/startup_\{log, _err\}" + log_warning_msg "FAILED - check ${RABBITMQ_LOG_BASE}/startup_\{log, _err\}" log_end_msg 1 ;; esac |