merge bug19089 into default
This commit is contained in:
commit
a3eda0459a
|
@ -36,7 +36,7 @@ SCRIPT_HOME=$(dirname $0)
|
||||||
export NODENAME NODE_IP_ADDRESS NODE_PORT SCRIPT_HOME PIDS_FILE
|
export NODENAME NODE_IP_ADDRESS NODE_PORT SCRIPT_HOME PIDS_FILE
|
||||||
|
|
||||||
exec erl \
|
exec erl \
|
||||||
-pa ../ebin \
|
-pa "`dirname $0`/../ebin" \
|
||||||
-noinput \
|
-noinput \
|
||||||
-hidden \
|
-hidden \
|
||||||
${ERL_ARGS} \
|
${ERL_ARGS} \
|
||||||
|
|
|
@ -41,7 +41,7 @@ if "%NODE_PORT%"=="" (
|
||||||
)
|
)
|
||||||
|
|
||||||
set PIDS_FILE=%RABBITMQ_BASE%\rabbitmq.pids
|
set PIDS_FILE=%RABBITMQ_BASE%\rabbitmq.pids
|
||||||
set SCRIPT_HOME=.
|
set SCRIPT_HOME=%~dp0%
|
||||||
|
|
||||||
if "%ERLANG_HOME%"=="" (
|
if "%ERLANG_HOME%"=="" (
|
||||||
set ERLANG_HOME=%~dp0%..\..\..
|
set ERLANG_HOME=%~dp0%..\..\..
|
||||||
|
@ -59,5 +59,5 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" (
|
||||||
exit /B
|
exit /B
|
||||||
)
|
)
|
||||||
|
|
||||||
"%ERLANG_HOME%\bin\erl.exe" -pa ../ebin -noinput -hidden -sname rabbitmq_multi -s rabbit_multi %START_ARGS% -extra %*
|
"%ERLANG_HOME%\bin\erl.exe" -pa "%~dp0..\ebin" -noinput -hidden -sname rabbitmq_multi -s rabbit_multi %START_ARGS% -extra %*
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
erl \
|
erl \
|
||||||
-pa $(dirname $0)/../ebin \
|
-pa "`dirname $0`/../ebin" \
|
||||||
${START_RABBIT} \
|
${START_RABBIT} \
|
||||||
-sname ${NODENAME} \
|
-sname ${NODENAME} \
|
||||||
-boot start_sasl \
|
-boot start_sasl \
|
||||||
|
|
|
@ -92,7 +92,7 @@ set CLUSTER_CONFIG=-rabbit cluster_config \""%CLUSTER_CONFIG_FILE:\=/%"\"
|
||||||
set MNESIA_DIR=%MNESIA_BASE%/%NODENAME%-mnesia
|
set MNESIA_DIR=%MNESIA_BASE%/%NODENAME%-mnesia
|
||||||
|
|
||||||
"%ERLANG_HOME%\bin\erl.exe" ^
|
"%ERLANG_HOME%\bin\erl.exe" ^
|
||||||
-pa ..\ebin ^
|
-pa "%~dp0..\ebin" ^
|
||||||
-noinput ^
|
-noinput ^
|
||||||
-boot start_sasl ^
|
-boot start_sasl ^
|
||||||
-sname %NODENAME% ^
|
-sname %NODENAME% ^
|
||||||
|
|
|
@ -31,7 +31,7 @@ ERL_ARGS=
|
||||||
MNESIA_DIR=${MNESIA_BASE}/${NODENAME}
|
MNESIA_DIR=${MNESIA_BASE}/${NODENAME}
|
||||||
|
|
||||||
exec erl \
|
exec erl \
|
||||||
-pa ../ebin \
|
-pa "`dirname $0`/../ebin" \
|
||||||
-noinput \
|
-noinput \
|
||||||
-hidden \
|
-hidden \
|
||||||
${ERL_ARGS} \
|
${ERL_ARGS} \
|
||||||
|
|
|
@ -40,4 +40,4 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" (
|
||||||
exit /B
|
exit /B
|
||||||
)
|
)
|
||||||
|
|
||||||
"%ERLANG_HOME%\bin\erl.exe" -pa ..\ebin -noinput -hidden -sname rabbitmqctl -s rabbit_control -extra %*
|
"%ERLANG_HOME%\bin\erl.exe" -pa "%~dp0..\ebin" -noinput -hidden -sname rabbitmqctl -s rabbit_control -extra %*
|
||||||
|
|
Loading…
Reference in New Issue