diff --git a/deps/rabbit/src/rabbit_peer_discovery.erl b/deps/rabbit/src/rabbit_peer_discovery.erl index af4a975bdcb1..40a97b472d5d 100644 --- a/deps/rabbit/src/rabbit_peer_discovery.erl +++ b/deps/rabbit/src/rabbit_peer_discovery.erl @@ -22,6 +22,7 @@ maybe_unregister/0, discover_cluster_nodes/0]). -export([backend/0, + should_perform_registration/0, node_type/0, normalize/1, append_node_prefix/1, diff --git a/deps/rabbitmq_peer_discovery_consul/src/rabbitmq_peer_discovery_consul_health_check_helper.erl b/deps/rabbitmq_peer_discovery_consul/src/rabbitmq_peer_discovery_consul_health_check_helper.erl index 33e54d34564c..8d832c514e38 100644 --- a/deps/rabbitmq_peer_discovery_consul/src/rabbitmq_peer_discovery_consul_health_check_helper.erl +++ b/deps/rabbitmq_peer_discovery_consul/src/rabbitmq_peer_discovery_consul_health_check_helper.erl @@ -33,12 +33,17 @@ start_link() -> gen_server:start_link({local, ?MODULE}, ?MODULE, [], []). init([]) -> - case rabbit_peer_discovery:backend() of - rabbit_peer_discovery_consul -> - set_up_periodic_health_check(); - rabbitmq_peer_discovery_consul -> - set_up_periodic_health_check(); - _ -> + case rabbit_peer_discovery:should_perform_registration() of + true -> + case rabbit_peer_discovery:backend() of + rabbit_peer_discovery_consul -> + set_up_periodic_health_check(); + rabbitmq_peer_discovery_consul -> + set_up_periodic_health_check(); + _ -> + {ok, #state{}} + end; + false -> {ok, #state{}} end.