Skip to content

Commit 8a09cea

Browse files
lukebakkenmergify[bot]
authored andcommitted
Take -setcookie argument into account for peer args
Fixes issue raised in discussion #11653 The user used the following env var: ``` RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-setcookie FOOBARBAZ" ``` ...and the cookie was not passed to the peer node for peer discovery. (cherry picked from commit c3c4612)
1 parent 2af9b09 commit 8a09cea

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

deps/rabbit/src/rabbit_peer_discovery.erl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,12 @@ query_node_props(Nodes) when Nodes =/= [] ->
387387
var_origins := #{erlang_cookie := environment}} ->
388388
["-setcookie", atom_to_list(ErlangCookie) | VMArgs1];
389389
_ ->
390-
VMArgs1
390+
case init:get_argument(setcookie) of
391+
{ok, [[SetCookieArg]]} ->
392+
["-setcookie", SetCookieArg | VMArgs1];
393+
_ ->
394+
VMArgs1
395+
end
391396
end,
392397
VMArgs3 = maybe_add_proto_dist_arguments(VMArgs2),
393398
VMArgs4 = maybe_add_inetrc_arguments(VMArgs3),

0 commit comments

Comments
 (0)