diff options
| -rw-r--r-- | apps/rabbitmq_prelaunch/src/rabbit_prelaunch_dist.erl | 6 | ||||
| -rw-r--r-- | apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_dist.erl b/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_dist.erl index 70f99feba6..ccb3c28ab6 100644 --- a/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_dist.erl +++ b/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_dist.erl @@ -43,11 +43,11 @@ do_setup(#{nodename := Node, nodename_type := NameType}) -> duplicate_node_check(#{split_nodename := {NodeName, NodeHost}}) -> rabbit_log_prelaunch:debug( "Checking if node name ~s is already used", [NodeName]), - PrelaunchName = rabbit_nodes:make( + PrelaunchName = rabbit_nodes_common:make( {NodeName ++ "_prelaunch_" ++ os:getpid(), "localhost"}), {ok, _} = net_kernel:start([PrelaunchName, shortnames]), - case rabbit_nodes:names(NodeHost) of + case rabbit_nodes_common:names(NodeHost) of {ok, NamePorts} -> case proplists:is_defined(NodeName, NamePorts) of true -> @@ -93,7 +93,7 @@ dist_port_use_check_ipv6(NodeHost, Port) -> no_return(). dist_port_use_check_fail(Port, Host) -> - {ok, Names} = rabbit_nodes:names(Host), + {ok, Names} = rabbit_nodes_common:names(Host), case [N || {N, P} <- Names, P =:= Port] of [] -> throw({error, {dist_port_already_used, Port, not_erlang, Host}}); diff --git a/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl b/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl index 46392ea499..86bf579210 100644 --- a/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl +++ b/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl @@ -44,7 +44,7 @@ format_error({error, {erlang_dist_running_with_unexpected_nodename, format_error({bad_config_entry_decoder, missing_passphrase}) -> rabbit_misc:format( "Missing passphrase or missing passphrase read method in " - "`config_entry_decoder`"); + "`config_entry_decoder`", []); format_error({config_decryption_error, {key, Key}, _Msg}) -> rabbit_misc:format( "Error while decrypting key '~p'. Please check encrypted value, " |