Skip to content

Commit 20a58d5

Browse files
rabbit.autocluster => rabbit.cluster_formation
This name is both more descriptive and helps us avoid any possible conflicts with rabbitmq-autocluster, in particular in the new config format (Cuttlefish) that we will introduce for both soon. Per discussion with @dcorbacho.
1 parent 71db1fe commit 20a58d5

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/rabbit_peer_discovery.erl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
-spec backend() -> atom().
4242

4343
backend() ->
44-
case application:get_env(rabbit, autocluster) of
44+
case application:get_env(rabbit, cluster_formation) of
4545
{ok, Proplist} ->
4646
proplists:get_value(peer_discovery_backend, Proplist, ?DEFAULT_BACKEND);
4747
undefined ->
@@ -53,7 +53,7 @@ backend() ->
5353
-spec node_type() -> rabbit_types:node_type().
5454

5555
node_type() ->
56-
case application:get_env(rabbit, autocluster) of
56+
case application:get_env(rabbit, cluster_formation) of
5757
{ok, Proplist} ->
5858
proplists:get_value(node_type, Proplist, ?DEFAULT_NODE_TYPE);
5959
undefined ->
@@ -147,7 +147,7 @@ inject_randomized_delay() ->
147147
-spec randomized_delay_range_in_ms() -> {integer(), integer()}.
148148

149149
randomized_delay_range_in_ms() ->
150-
{Min, Max} = case application:get_env(rabbit, autocluster) of
150+
{Min, Max} = case application:get_env(rabbit, cluster_formation) of
151151
{ok, Proplist} ->
152152
proplists:get_value(randomized_startup_delay_range, Proplist, ?DEFAULT_STARTUP_RANDOMIZED_DELAY);
153153
undefined ->

src/rabbit_peer_discovery_dns.erl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
-spec list_nodes() -> {ok, Nodes :: list()} | {error, Reason :: string()}.
3232

3333
list_nodes() ->
34-
case application:get_env(rabbit, autocluster) of
34+
case application:get_env(rabbit, cluster_formation) of
3535
undefined ->
3636
{[], disc};
37-
{ok, Autocluster} ->
38-
case proplists:get_value(peer_discovery_dns, Autocluster) of
37+
{ok, ClusterFormation} ->
38+
case proplists:get_value(peer_discovery_dns, ClusterFormation) of
3939
undefined ->
4040
rabbit_log:warning("Peer discovery backend is set to ~s "
41-
"but final config does not contain rabbit.autocluster.peer_discovery_dns. "
41+
"but final config does not contain rabbit.cluster_formation.peer_discovery_dns. "
4242
"Cannot discover any nodes because seed hostname is not configured!",
4343
[?MODULE]),
4444
{[], disc};

0 commit comments

Comments
 (0)