summaryrefslogtreecommitdiff
path: root/deps/rabbitmq_federation/src/rabbit_federation_link_sup.erl
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-10-08 13:46:11 +0100
committerSimon MacMullen <simon@rabbitmq.com>2013-10-08 13:46:11 +0100
commit0055e0c1fa83c87f1d78027da68d9d13bd4f810b (patch)
tree125520f64ddde41ec05c3be1e6630f7f2ad86b27 /deps/rabbitmq_federation/src/rabbit_federation_link_sup.erl
parentaa4adfac0c4803ec1b8e67f1334236f7e4ef564e (diff)
downloadrabbitmq-server-git-0055e0c1fa83c87f1d78027da68d9d13bd4f810b.tar.gz
Support a "federation-upstream" policy, and test it in the max_hops_test.
Diffstat (limited to 'deps/rabbitmq_federation/src/rabbit_federation_link_sup.erl')
-rw-r--r--deps/rabbitmq_federation/src/rabbit_federation_link_sup.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/deps/rabbitmq_federation/src/rabbit_federation_link_sup.erl b/deps/rabbitmq_federation/src/rabbit_federation_link_sup.erl
index 1d992f05e9..ed6a1218d5 100644
--- a/deps/rabbitmq_federation/src/rabbit_federation_link_sup.erl
+++ b/deps/rabbitmq_federation/src/rabbit_federation_link_sup.erl
@@ -59,10 +59,10 @@ adjust(Sup, XorQ, {clear_upstream, UpstreamName}) ->
%% TODO handle changes of upstream sets minimally (bug 24853)
adjust(Sup, X = #exchange{name = XName}, {upstream_set, Set}) ->
- case rabbit_federation_upstream:set_for(X) of
- undefined -> ok;
- Set -> ok = rabbit_federation_db:prune_scratch(
- XName, rabbit_federation_upstream:for(X))
+ case rabbit_federation_upstream:federate(X) of
+ false -> ok;
+ true -> ok = rabbit_federation_db:prune_scratch(
+ XName, rabbit_federation_upstream:for(X))
end,
adjust(Sup, X, everything);
adjust(Sup, Q = #amqqueue{}, {upstream_set, _}) ->