Skip to content

Commit 5ec1824

Browse files
committed
Ensure that peer node deals with unicode
Follow-up to #10759 Related to #10194 Related to erlang/otp#8289
1 parent 3d043e8 commit 5ec1824

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

deps/rabbit/src/rabbit_peer_discovery.erl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ query_node_props(Nodes) when Nodes =/= [] ->
421421
%% By using a temporary intermediate hidden node, we ask Erlang not to
422422
%% connect everyone automatically.
423423
Context = rabbit_prelaunch:get_context(),
424-
VMArgs0 = ["-hidden"],
424+
VMArgs0 = ["+pc","unicode","-hidden"],
425425
VMArgs1 = case init:get_argument(boot) of
426426
{ok, [[BootFileArg]]} ->
427427
["-boot", BootFileArg | VMArgs0];
@@ -515,7 +515,7 @@ maybe_add_inetrc_arguments1(VMArgs, Val) ->
515515
%% The filename argument must be passed as a quoted string so that the
516516
%% command line is correctly parsed as an Erlang string by the temporary
517517
%% hidden node.
518-
ValString = rabbit_misc:format("~0p", [Val]),
518+
ValString = rabbit_misc:format("~0p", [unicode:characters_to_list(Val)]),
519519
["-kernel", "inetrc", ValString | VMArgs].
520520

521521
maybe_add_tls_arguments(VMArgs) ->
@@ -571,7 +571,8 @@ maybe_add_tls_arguments(VMArgs) ->
571571
%% "no_dot_erlang","-hidden"],
572572
VMArgs1 = case init:get_argument(ssl_dist_opt) of
573573
{ok, SslDistOpts0} ->
574-
SslDistOpts1 = [["-ssl_dist_opt" | SslDistOpt]
574+
SslDistOpts1 = [["-ssl_dist_opt" |
575+
unicode:characters_to_list(SslDistOpt)]
575576
|| SslDistOpt <- SslDistOpts0],
576577
SslDistOpts2 = lists:concat(SslDistOpts1),
577578
SslDistOpts2 ++ VMArgs;
@@ -588,7 +589,8 @@ maybe_add_tls_arguments(VMArgs) ->
588589
%% argument list.
589590
VMArgs2 = case init:get_argument(ssl_dist_optfile) of
590591
{ok, [[SslDistOptfileArg]]} ->
591-
["-ssl_dist_optfile", SslDistOptfileArg | VMArgs1];
592+
["-ssl_dist_optfile",
593+
unicode:characters_to_list(SslDistOptfileArg) | VMArgs1];
592594
_ ->
593595
VMArgs1
594596
end,

0 commit comments

Comments
 (0)