diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-02-28 11:00:19 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-02-28 11:00:19 +0000 |
| commit | 73f01f6acdcd87b607fc36e683ea58711a9d0713 (patch) | |
| tree | dfa8837b2e32eb3d80fbd7415bbdf64df5aba79f /scripts/rabbitmq-env | |
| parent | 91fa60797b8183a2dcd3ceac362f78bfb9560b1f (diff) | |
| parent | b4fae0526122f5d4d221204cab4b163bc57baa0c (diff) | |
| download | rabbitmq-server-git-73f01f6acdcd87b607fc36e683ea58711a9d0713.tar.gz | |
Merge bug23580 (Add statistics for 'basic.return')
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 |