diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-09-27 22:04:11 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-09-27 22:04:11 +0100 |
| commit | b4a94be0eedcde2f757a81acc583330c8c0d9e30 (patch) | |
| tree | ff596895fe7ec0fb0ce6b07d0cb5ab40b59e0921 | |
| parent | 5d49e7111b55c0faffa398b6436738b7adf48020 (diff) | |
| download | rabbitmq-server-git-b4a94be0eedcde2f757a81acc583330c8c0d9e30.tar.gz | |
rename a few funs to make their purpose clearer
| -rw-r--r-- | src/rabbit_binding.erl | 14 | ||||
| -rw-r--r-- | src/rabbit_exchange.erl | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/rabbit_binding.erl b/src/rabbit_binding.erl index ff3fa5ac2d..555b17ccd3 100644 --- a/src/rabbit_binding.erl +++ b/src/rabbit_binding.erl @@ -37,7 +37,7 @@ list_for_source_and_destination/2]). -export([info_keys/0, info/1, info/2, info_all/1, info_all/2]). %% these must all be run inside a mnesia tx --export([has_for_exchange/1, remove_for_exchange/1, +-export([has_for_source/1, remove_for_source/1, remove_for_destination/1, remove_transient_for_destination/1]). %%---------------------------------------------------------------------------- @@ -79,8 +79,8 @@ -spec(info_all/1 :: (rabbit_types:vhost()) -> [[rabbit_types:info()]]). -spec(info_all/2 ::(rabbit_types:vhost(), [rabbit_types:info_key()]) -> [[rabbit_types:info()]]). --spec(has_for_exchange/1 :: (rabbit_exchange:name()) -> boolean()). --spec(remove_for_exchange/1 :: (rabbit_exchange:name()) -> bindings()). +-spec(has_for_source/1 :: (rabbit_exchange:name()) -> boolean()). +-spec(remove_for_source/1 :: (rabbit_exchange:name()) -> bindings()). -spec(remove_for_destination/1 :: (rabbit_types:binding_destination()) -> fun (() -> any())). -spec(remove_transient_for_destination/1 :: @@ -227,14 +227,14 @@ info_all(VHostPath) -> map(VHostPath, fun (B) -> info(B) end). info_all(VHostPath, Items) -> map(VHostPath, fun (B) -> info(B, Items) end). -has_for_exchange(XName) -> - Match = #route{binding = #binding{source = XName, _ = '_'}}, +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 contains(rabbit_route, Match) orelse contains(rabbit_durable_route, Match). -remove_for_exchange(XName) -> +remove_for_source(SrcName) -> [begin ok = mnesia:delete_object(rabbit_reverse_route, reverse_route(Route), write), @@ -242,7 +242,7 @@ remove_for_exchange(XName) -> Route#route.binding end || Route <- mnesia:match_object( rabbit_route, - #route{binding = #binding{source = XName, + #route{binding = #binding{source = SrcName, _ = '_'}}, write)]. diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 14cd5cf41b..8497aa7b9b 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -305,13 +305,13 @@ maybe_auto_delete(#exchange{auto_delete = true} = X) -> end. conditional_delete(X = #exchange{name = XName}) -> - case rabbit_binding:has_for_exchange(XName) of + case rabbit_binding:has_for_source(XName) of false -> unconditional_delete(X); true -> {error, in_use} end. unconditional_delete(X = #exchange{name = XName}) -> - Bindings = rabbit_binding:remove_for_exchange(XName), + Bindings = rabbit_binding:remove_for_source(XName), ok = mnesia:delete({rabbit_durable_exchange, XName}), ok = mnesia:delete({rabbit_exchange, XName}), rabbit_event:notify(exchange_deleted, [{name, XName}]), |
