summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordcorbacho <dparracorbacho@piotal.io>2021-03-04 21:53:43 +0100
committerdcorbacho <dparracorbacho@piotal.io>2021-03-04 21:53:43 +0100
commitb9836cc3b2ea225b0a1a734790151ce8422f608a (patch)
treedc59cd977f85f794a527a838eebe1e4979d17709
parent00510fe84b80a7a5fa1264faf48048bf4953d2b0 (diff)
downloadrabbitmq-server-git-otp-24-federation.tar.gz
Remove federation_up/0 checkotp-24-federation
Decorators are only executed if the plugin is enabled (registered in rabbit_queue_decorator), thus initialising the links through `startup`. There is no obvious way for a fed link to start if the plugin isn't running, so this check can be removed.
-rw-r--r--deps/rabbitmq_federation/src/rabbit_federation_exchange_link.erl7
-rw-r--r--deps/rabbitmq_federation/src/rabbit_federation_queue_link.erl7
2 files changed, 2 insertions, 12 deletions
diff --git a/deps/rabbitmq_federation/src/rabbit_federation_exchange_link.erl b/deps/rabbitmq_federation/src/rabbit_federation_exchange_link.erl
index a43202892d..dba68e751c 100644
--- a/deps/rabbitmq_federation/src/rabbit_federation_exchange_link.erl
+++ b/deps/rabbitmq_federation/src/rabbit_federation_exchange_link.erl
@@ -92,12 +92,7 @@ handle_call(Msg, _From, State) ->
{stop, {unexpected_call, Msg}, State}.
handle_cast(maybe_go, State = {not_started, _Args}) ->
- case federation_up() of
- true -> go(State);
- false ->
- _ = timer:apply_after(1000, ?MODULE, go, []),
- {noreply, State}
- end;
+ go(State);
handle_cast(go, S0 = {not_started, _Args}) ->
go(S0);
diff --git a/deps/rabbitmq_federation/src/rabbit_federation_queue_link.erl b/deps/rabbitmq_federation/src/rabbit_federation_queue_link.erl
index 1919d5d7e2..c0f5b738f8 100644
--- a/deps/rabbitmq_federation/src/rabbit_federation_queue_link.erl
+++ b/deps/rabbitmq_federation/src/rabbit_federation_queue_link.erl
@@ -83,12 +83,7 @@ handle_call(Msg, _From, State) ->
{stop, {unexpected_call, Msg}, State}.
handle_cast(maybe_go, State) ->
- case federation_up() of
- true -> go(State);
- false ->
- _ = timer:apply_after(1000, ?MODULE, go, []),
- {noreply, State}
- end;
+ go(State);
handle_cast(go, State = #not_started{}) ->
go(State);