diff options
| author | Michael Bridgen <mikeb@rabbitmq.com> | 2011-04-08 13:23:48 +0100 |
|---|---|---|
| committer | Michael Bridgen <mikeb@rabbitmq.com> | 2011-04-08 13:23:48 +0100 |
| commit | 642bf663adb9d4326cc75c6f3a01c5b9882d02d2 (patch) | |
| tree | d25a478b9d28749611a62cd883a2d5c2681d3b0c /scripts | |
| parent | 06392c3a31d16b16320e6e2ef9ee9ab48b1ffafb (diff) | |
| parent | 8e802f0ff0472a7b45f987a421dd46406b715ea2 (diff) | |
| download | rabbitmq-server-git-642bf663adb9d4326cc75c6f3a01c5b9882d02d2.tar.gz | |
Merge bug23550 (show direct connections in mgmt)
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-env | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 3e17394981..a2ef8d3ceb 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -37,7 +37,8 @@ RABBITMQ_HOME="${SCRIPT_DIR}/.." NODENAME=rabbit@${HOSTNAME%%.*} # Load configuration from the rabbitmq.conf file -if [ -f /etc/rabbitmq/rabbitmq.conf ]; then +if [ -f /etc/rabbitmq/rabbitmq.conf ] && \ + [ ! -f /etc/rabbitmq/rabbitmq-env.conf ] ; then echo -n "WARNING: ignoring /etc/rabbitmq/rabbitmq.conf -- " echo "location has moved to /etc/rabbitmq/rabbitmq-env.conf" fi |