diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-02-18 18:30:18 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-02-18 18:30:18 +0300 |
| commit | c66d51f4f57c425bfa2fa152bd4895ed56915ceb (patch) | |
| tree | 0214fe81f65323a7eda762306bf443bbe0a4e6b7 /scripts/rabbitmq-env.bat | |
| parent | 4152ecbc7a7a4d0223a4f51f542149da04f37692 (diff) | |
| parent | 01e039f4dd2b6d78d9d67f7472bc06394f320fc3 (diff) | |
| download | rabbitmq-server-git-c66d51f4f57c425bfa2fa152bd4895ed56915ceb.tar.gz | |
Merge branch 'stable' into rabbitmq-server-248
Diffstat (limited to 'scripts/rabbitmq-env.bat')
| -rw-r--r-- | scripts/rabbitmq-env.bat | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat index 66a1daf851..d5df9ddbd6 100644 --- a/scripts/rabbitmq-env.bat +++ b/scripts/rabbitmq-env.bat @@ -77,6 +77,8 @@ if "!RABBITMQ_NODENAME!"=="" ( if "!NODENAME!"=="" (
REM We use Erlang to query the local hostname because
REM !COMPUTERNAME! and Erlang may return different results.
+ REM Start erl with -sname to make sure epmd is started.
+ call "%ERLANG_HOME%\bin\erl.exe" -A0 -noinput -boot start_clean -sname rabbit-prelaunch-epmd -eval "init:stop()." >nul 2>&1
for /f "delims=" %%F in ('call "%ERLANG_HOME%\bin\erl.exe" -A0 -noinput -boot start_clean -eval "net_kernel:start([list_to_atom(""rabbit-gethostname-"" ++ os:getpid()), %NAMETYPE%]), [_, H] = string:tokens(atom_to_list(node()), ""@""), io:format(""~s~n"", [H]), init:stop()."') do @set HOSTNAME=%%F
set RABBITMQ_NODENAME=rabbit@!HOSTNAME!
set HOSTNAME=
@@ -224,10 +226,10 @@ if "!RABBITMQ_PLUGINS_EXPAND_DIR!"=="" ( set RABBITMQ_PLUGINS_EXPAND_DIR=!PLUGINS_EXPAND_DIR!
)
)
-if not exist "!RABBITMQ_PLUGINS_EXPAND_DIR!" (
- mkdir "!RABBITMQ_PLUGINS_EXPAND_DIR!"
-)
-for /f "delims=" %%F in ("!RABBITMQ_PLUGINS_EXPAND_DIR!") do set RABBITMQ_PLUGINS_EXPAND_DIR=%%~sF
+REM FIXME: RabbitMQ removes and recreates RABBITMQ_PLUGINS_EXPAND_DIR
+REM itself. Therefore we can't create it here in advance and escape the
+REM directory name, and RABBITMQ_PLUGINS_EXPAND_DIR must not contain
+REM non-US-ASCII characters.
REM [ "x" = "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE=${ENABLED_PLUGINS_FILE}
if "!RABBITMQ_ENABLED_PLUGINS_FILE!"=="" (
|