diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-10-14 07:35:04 +0800 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-10-14 07:35:04 +0800 |
| commit | 23d84850f8fe3d4b7f99c7635f0b81eab312bbbf (patch) | |
| tree | c85afb41f157c3ebd1b6a721132ec9511bf27f0f /src | |
| parent | 0454457f4ef429d6b9d0337aa43fa738da3b5d72 (diff) | |
| download | rabbitmq-server-git-23d84850f8fe3d4b7f99c7635f0b81eab312bbbf.tar.gz | |
Be more defensive and accept 'disk'
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_mnesia.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index d638185aef..d66f5b8fab 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -123,7 +123,7 @@ init_from_config() -> {DiscoveredNodes, NodeType} = case rabbit_peer_discovery:discover_cluster_nodes() of {ok, {Nodes, Type} = Config} - when is_list(Nodes) andalso (Type == disc orelse Type == ram) -> + when is_list(Nodes) andalso (Type == disc orelse Type == disk orelse Type == ram) -> case lists:foldr(FindBadNodeNames, [], Nodes) of [] -> Config; BadNames -> e({invalid_cluster_node_names, BadNames}) |