merge bug20460

Matthias Radestock · Matthias Radestock · commit 8835081a481b · 2009-03-25T20:10:23.000Z
diff --git 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
@@ -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 %*

Original file line number	Diff line number	Diff line change
`@@ -46,4 +46,4 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" (`
`46`	`46`	`exit /B`
`47`	`47`	`)`
`48`	`48`
`49`		`-"%ERLANG_HOME%\bin\erl.exe" -pa "%~dp0..\ebin" -noinput -hidden -sname rabbitmqctl -s rabbit_control -extra %*`
	`49`	`+"%ERLANG_HOME%\bin\erl.exe" -pa "%~dp0..\ebin" -noinput -hidden %RABBITMQ_CTL_ERL_ARGS% -sname rabbitmqctl -s rabbit_control -extra %*`