Skip to content

Commit 4282f62

Browse files
author
Simon MacMullen
committed
Backport bug25087 (prelaunch and rabbitmqctl nodename insufficiently random on Windows)
1 parent 8c57cfd commit 4282f62

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

scripts/rabbitmq-plugins.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if "!RABBITMQ_PLUGINS_DIR!"=="" (
4747
set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins
4848
)
4949

50-
"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden -sname rabbitmq-plugins!RANDOM! -s rabbit_plugins -enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" -plugins_dist_dir "!RABBITMQ_PLUGINS_DIR:\=/!" -extra !STAR!
50+
"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden -sname rabbitmq-plugins!RANDOM!!TIME:~9! -s rabbit_plugins -enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" -plugins_dist_dir "!RABBITMQ_PLUGINS_DIR:\=/!" -extra !STAR!
5151

5252
endlocal
5353
endlocal

scripts/rabbitmq-server.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin
9696
-pa "!RABBITMQ_EBIN_ROOT!" ^
9797
-noinput -hidden ^
9898
-s rabbit_prelaunch ^
99-
-sname rabbitmqprelaunch!RANDOM! ^
99+
-sname rabbitmqprelaunch!RANDOM!!TIME:~9! ^
100100
-extra "!RABBITMQ_ENABLED_PLUGINS_FILE:\=/!" ^
101101
"!RABBITMQ_PLUGINS_DIR:\=/!" ^
102102
"!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!" ^

scripts/rabbitmqctl.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" (
4343
exit /B
4444
)
4545

46-
"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden !RABBITMQ_CTL_ERL_ARGS! -sname rabbitmqctl!RANDOM! -s rabbit_control -nodename !RABBITMQ_NODENAME! -extra !STAR!
46+
"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden !RABBITMQ_CTL_ERL_ARGS! -sname rabbitmqctl!RANDOM!!TIME:~9! -s rabbit_control -nodename !RABBITMQ_NODENAME! -extra !STAR!
4747

4848
endlocal
4949
endlocal

0 commit comments

Comments
 (0)