diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-04-28 15:05:55 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-04-28 15:05:55 +0100 |
| commit | 78759491b8cb7f4d006bd021fcc0cb0dde08e413 (patch) | |
| tree | f02544bb60347224cf86a49133b4ae10eb1ab72d /scripts | |
| parent | 20710489718efdf22412bb0316957719f0783059 (diff) | |
| parent | ca1ad94464bde375a054162e2ee91a688ab9e7dd (diff) | |
| download | rabbitmq-server-git-78759491b8cb7f4d006bd021fcc0cb0dde08e413.tar.gz | |
Merging default into bug24004
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-env | 3 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 1 |
2 files changed, 3 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 diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index aa428a8c4e..b2aa4f58c9 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -227,6 +227,7 @@ set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:"=\"! -stopaction "rabbit:stop_and_halt()." ^
-sname !RABBITMQ_NODENAME! ^
!CONSOLE_FLAG! ^
+-comment "A robust and scalable messaging broker" ^
-args "!ERLANG_SERVICE_ARGUMENTS!" > NUL
goto END
|