summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Sebastien Pedron <jean-sebastien@rabbitmq.com>2014-11-24 17:40:23 +0100
committerJean-Sebastien Pedron <jean-sebastien@rabbitmq.com>2014-11-24 17:40:23 +0100
commita29e4c5187e6d99e05f3f5f9a04dd2d7d793732d (patch)
treeafa2500d86c5b665e97245eb9b7465226e9f5e03
parente7267bf3d34667836d52a133098382adda66362e (diff)
downloadrabbitmq-server-git-a29e4c5187e6d99e05f3f5f9a04dd2d7d793732d.tar.gz
When reporting invalid cluster node names, keep configuration order
While here, fix an unused variable warning.
-rw-r--r--src/rabbit_mnesia.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 8fbacdae92..91a8b14062 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -121,7 +121,7 @@ init_from_config() ->
case application:get_env(rabbit, cluster_nodes) of
{ok, {Nodes, Type} = Config}
when is_list(Nodes) andalso (Type == disc orelse Type == ram) ->
- case lists:foldl(FindBadNodeNames, [], Nodes) of
+ case lists:foldr(FindBadNodeNames, [], Nodes) of
[] -> Config;
BadNames -> e({invalid_cluster_node_names, BadNames})
end;
@@ -130,9 +130,9 @@ init_from_config() ->
{ok, Nodes} when is_list(Nodes) ->
%% The legacy syntax (a nodes list without the node
%% type) is unsupported.
- case lists:foldl(FindBadNodeNames, [], Nodes) of
- [] -> e(cluster_node_type_mandatory);
- BadNames -> e(invalid_cluster_nodes_conf)
+ case lists:foldr(FindBadNodeNames, [], Nodes) of
+ [] -> e(cluster_node_type_mandatory);
+ _ -> e(invalid_cluster_nodes_conf)
end;
{ok, _} ->
e(invalid_cluster_nodes_conf)