diff options
| author | Matthias Radestock <matthias@lshift.net> | 2009-03-25 20:10:23 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2009-03-25 20:10:23 +0000 |
| commit | 8835081a481b8da24044dde561093481093fd9d5 (patch) | |
| tree | e3bddcda1fa03c39d2c120b483b8f01ca03104d3 /scripts | |
| parent | 467bc5861a5b45b375da0b7dd35d2bf9af862da1 (diff) | |
| parent | b8cc0c89bba520f2e4ddd9ec10cff0be0df24534 (diff) | |
| download | rabbitmq-server-git-8835081a481b8da24044dde561093481093fd9d5.tar.gz | |
merge bug20460
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmqctl | 5 | ||||
| -rwxr-xr-x | scripts/rabbitmqctl.bat | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl index b941b85005..c57978c050 100755 --- a/scripts/rabbitmqctl +++ b/scripts/rabbitmqctl @@ -30,10 +30,15 @@ ## Contributor(s): ______________________________________. ## +[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf + +[ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS} + exec erl \ -pa "`dirname $0`/../ebin" \ -noinput \ -hidden \ + ${RABBITMQ_CTL_ERL_ARGS} \ -sname rabbitmqctl$$ \ -s rabbit_control \ -extra "$@" diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat index 33a10777d0..e4dccfba64 100755 --- a/scripts/rabbitmqctl.bat +++ b/scripts/rabbitmqctl.bat @@ -46,4 +46,4 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" ( exit /B
)
-"%ERLANG_HOME%\bin\erl.exe" -pa "%~dp0..\ebin" -noinput -hidden -sname rabbitmqctl -s rabbit_control -extra %*
+"%ERLANG_HOME%\bin\erl.exe" -pa "%~dp0..\ebin" -noinput -hidden %RABBITMQ_CTL_ERL_ARGS% -sname rabbitmqctl -s rabbit_control -extra %*
|