Merge pull request #10826 from rabbitmq/peer-discovery-utf8-settings

Ensure that peer node deals with unicode

Author: michaelklishin

deps/rabbit/src/rabbit_peer_discovery.erl

@@ -421,7 +421,7 @@ query_node_props(Nodes) when Nodes =/= [] ->
     %% By using a temporary intermediate hidden node, we ask Erlang not to
     %% connect everyone automatically.
     Context = rabbit_prelaunch:get_context(),
-    VMArgs0 = ["-hidden"],
+    VMArgs0 = ["+pc","unicode","-hidden"],
     VMArgs1 = case init:get_argument(boot) of
                   {ok, [[BootFileArg]]} ->
                       ["-boot", BootFileArg | VMArgs0];
@@ -511,11 +511,13 @@ maybe_add_inetrc_arguments(VMArgs) ->
             end
     end.
 
+maybe_add_inetrc_arguments1(VMArgs, Val) when is_atom(Val) ->
+    maybe_add_inetrc_arguments1(VMArgs, atom_to_list(Val));
 maybe_add_inetrc_arguments1(VMArgs, Val) ->
     %% The filename argument must be passed as a quoted string so that the
     %% command line is correctly parsed as an Erlang string by the temporary
     %% hidden node.
-    ValString = rabbit_misc:format("~0p", [Val]),
+    ValString = rabbit_misc:format("~0p", [unicode:characters_to_list(Val)]),
     ["-kernel", "inetrc", ValString | VMArgs].
 
 maybe_add_tls_arguments(VMArgs) ->
@@ -571,7 +573,8 @@ maybe_add_tls_arguments(VMArgs) ->
     %%     "no_dot_erlang","-hidden"],
     VMArgs1 = case init:get_argument(ssl_dist_opt) of
                   {ok, SslDistOpts0} ->
-                      SslDistOpts1 = [["-ssl_dist_opt" | SslDistOpt]
+                      SslDistOpts1 = [["-ssl_dist_opt" |
+                                       unicode:characters_to_list(SslDistOpt)]
                                       || SslDistOpt <- SslDistOpts0],
                       SslDistOpts2 = lists:concat(SslDistOpts1),
                       SslDistOpts2 ++ VMArgs;
@@ -588,7 +591,8 @@ maybe_add_tls_arguments(VMArgs) ->
     %% argument list.
     VMArgs2 = case init:get_argument(ssl_dist_optfile) of
                   {ok, [[SslDistOptfileArg]]} ->
-                      ["-ssl_dist_optfile", SslDistOptfileArg | VMArgs1];
+                      ["-ssl_dist_optfile",
+                       unicode:characters_to_list(SslDistOptfileArg) | VMArgs1];
                   _ ->
                       VMArgs1
               end,