diff options
| author | Hubert Plociniczak <hubert@lshift.net> | 2009-03-24 01:49:22 +0000 |
|---|---|---|
| committer | Hubert Plociniczak <hubert@lshift.net> | 2009-03-24 01:49:22 +0000 |
| commit | b0f88c37a039aaf0362e33d1dd15ef4370e933ec (patch) | |
| tree | 2835a989001206523c1e644e170769ad754c7ede | |
| parent | 421f044f6cb6ca5551c143cef877ad7f4f9ceb81 (diff) | |
| download | rabbitmq-server-bug20460.tar.gz | |
Added RABBITMQ_CTL_ERL_ARGS into rabbitmqctl scriptbug20460
| -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 b941b850..c57978c0 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 33a10777..e4dccfba 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 %*
|