diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-02-25 14:41:09 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-02-25 14:41:09 +0000 |
| commit | c5278e21223d8ad7af73d3b73240435019822635 (patch) | |
| tree | 2c169fb83a599b8b8fd5cdbfc7a18e26286256f7 /scripts/rabbitmq-env | |
| parent | 55f5c2a8fdb5d243ffb7414faf84c1626da80c87 (diff) | |
| parent | 96f8ba03363b077cfe7cb5169f73c0e54ce5f26a (diff) | |
| download | rabbitmq-server-git-c5278e21223d8ad7af73d3b73240435019822635.tar.gz | |
Merge bug23076 (preventing bad_arg error in rabbit_event during shutdown)
Diffstat (limited to 'scripts/rabbitmq-env')
| -rwxr-xr-x | scripts/rabbitmq-env | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index df4b24d8fc..3e17394981 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -37,4 +37,8 @@ RABBITMQ_HOME="${SCRIPT_DIR}/.." NODENAME=rabbit@${HOSTNAME%%.*} # Load configuration from the rabbitmq.conf file -[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf +if [ -f /etc/rabbitmq/rabbitmq.conf ]; then + echo -n "WARNING: ignoring /etc/rabbitmq/rabbitmq.conf -- " + echo "location has moved to /etc/rabbitmq/rabbitmq-env.conf" +fi +[ -f /etc/rabbitmq/rabbitmq-env.conf ] && . /etc/rabbitmq/rabbitmq-env.conf |