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/common | |
| 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/common')
| -rw-r--r-- | packaging/common/rabbitmq-script-wrapper | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/packaging/common/rabbitmq-script-wrapper b/packaging/common/rabbitmq-script-wrapper index c9508847f9..95c13aa028 100644 --- a/packaging/common/rabbitmq-script-wrapper +++ b/packaging/common/rabbitmq-script-wrapper @@ -30,6 +30,10 @@ cd /var/lib/rabbitmq SCRIPT=`basename $0` if [ `id -u` = `id -u rabbitmq` -a "$SCRIPT" = "rabbitmq-server" ] ; then + RABBITMQ_ENV=/usr/lib/rabbitmq/bin/rabbitmq-env + RABBITMQ_SCRIPTS_DIR=$(dirname "$RABBITMQ_ENV") + . "$RABBITMQ_ENV" + exec /usr/lib/rabbitmq/bin/rabbitmq-server "$@" @STDOUT_STDERR_REDIRECTION@ elif [ `id -u` = `id -u rabbitmq` -o "$SCRIPT" = "rabbitmq-plugins" ] ; then if [ -f $PWD/.erlang.cookie ] ; then |