diff options
| author | Michael Klishin <klishinm@vmware.com> | 2021-03-05 02:53:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-05 02:53:57 +0300 |
| commit | 01360836c7c7895611ce5b0ee3607d7ce0d4c200 (patch) | |
| tree | a800bf0ed8dad69bf55f549ebeb0b239586bbe5b | |
| parent | a310687478ebb72337d96c2722810f5e0fc013b0 (diff) | |
| parent | b9836cc3b2ea225b0a1a734790151ce8422f608a (diff) | |
| download | rabbitmq-server-git-01360836c7c7895611ce5b0ee3607d7ce0d4c200.tar.gz | |
Merge pull request #2868 from rabbitmq/otp-24-federation
Remove federation_up/0 check
| -rw-r--r-- | deps/rabbitmq_federation/src/rabbit_federation_exchange_link.erl | 7 | ||||
| -rw-r--r-- | deps/rabbitmq_federation/src/rabbit_federation_queue_link.erl | 7 |
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); |