diff options
author | Matthias Radestock <matthias@rabbitmq.com> | 2013-10-15 18:17:28 +0100 |
---|---|---|
committer | Matthias Radestock <matthias@rabbitmq.com> | 2013-10-15 18:17:28 +0100 |
commit | d3e4f486095ae3e2d1eff708c0d64fb0606c855d (patch) | |
tree | a9f53a46fcdd3afb810f8352fe6bb9b2c505c930 | |
parent | 97b64312544daef499dc979577e1e46414c292e5 (diff) | |
download | rabbitmq-server-d3e4f486095ae3e2d1eff708c0d64fb0606c855d.tar.gz |
cosmetic
-rw-r--r-- | src/rabbit_binding.erl | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/rabbit_binding.erl b/src/rabbit_binding.erl index 50e78eef..67f88a4e 100644 --- a/src/rabbit_binding.erl +++ b/src/rabbit_binding.erl @@ -280,9 +280,10 @@ info_all(VHostPath, Items) -> map(VHostPath, fun (B) -> info(B, Items) end). has_for_source(SrcName) -> Match = #route{binding = #binding{source = SrcName, _ = '_'}}, - %% we need to check for durable routes here too in case a bunch of - %% routes to durable queues have been removed temporarily as a - %% result of a node failure + %% we need to check for semi-durable routes (which subsumes + %% durable routes) here too in case a bunch of routes to durable + %% queues have been removed temporarily as a result of a node + %% failure contains(rabbit_route, Match) orelse contains(rabbit_semi_durable_route, Match). @@ -399,17 +400,17 @@ lock_route_tables() -> remove_routes(Routes) -> %% This partitioning allows us to suppress unnecessary delete %% operations on disk tables, which require an fsync. - {RAMRoutes, DiscRoutes} = + {RamRoutes, DiskRoutes} = lists:partition(fun (R) -> mnesia:match_object( rabbit_durable_route, R, write) == [] end, Routes), %% Of course the destination might not really be durable but it's %% just as easy to try to delete it from the semi-durable table %% than check first - [ok = sync_route(R, false, true, fun mnesia:delete_object/3) || - R <- RAMRoutes], + [ok = sync_route(R, false, true, fun mnesia:delete_object/3) || + R <- RamRoutes], [ok = sync_route(R, false, false, fun mnesia:delete_object/3) || - R <- DiscRoutes], + R <- DiskRoutes], [R#route.binding || R <- Routes]. remove_transient_routes(Routes) -> |