diff options
author | Simon MacMullen <simon@rabbitmq.com> | 2011-04-08 12:10:17 +0100 |
---|---|---|
committer | Simon MacMullen <simon@rabbitmq.com> | 2011-04-08 12:10:17 +0100 |
commit | 77784cf6bd022e7a83bd8637d459b33949dca618 (patch) | |
tree | 47c0f910dd0dbac55b757934cba457bcf05452b2 | |
parent | 1656e6f9a5083f56ad69082b55dd72f6fddf8a7c (diff) | |
download | rabbitmq-server-77784cf6bd022e7a83bd8637d459b33949dca618.tar.gz |
Go back to add_binding.
-rw-r--r-- | include/rabbit_exchange_type_spec.hrl | 4 | ||||
-rw-r--r-- | src/rabbit_binding.erl | 4 | ||||
-rw-r--r-- | src/rabbit_exchange_type.erl | 2 | ||||
-rw-r--r-- | src/rabbit_exchange_type_direct.erl | 4 | ||||
-rw-r--r-- | src/rabbit_exchange_type_fanout.erl | 4 | ||||
-rw-r--r-- | src/rabbit_exchange_type_headers.erl | 4 | ||||
-rw-r--r-- | src/rabbit_exchange_type_topic.erl | 10 | ||||
-rw-r--r-- | src/rabbit_tests.erl | 2 |
8 files changed, 16 insertions, 18 deletions
diff --git a/include/rabbit_exchange_type_spec.hrl b/include/rabbit_exchange_type_spec.hrl index fd3ddf7e..c80cc196 100644 --- a/include/rabbit_exchange_type_spec.hrl +++ b/include/rabbit_exchange_type_spec.hrl @@ -23,8 +23,8 @@ -spec(create/2 :: (boolean(), rabbit_types:exchange()) -> 'ok'). -spec(delete/3 :: (boolean(), rabbit_types:exchange(), [rabbit_types:binding()]) -> 'ok'). --spec(add_bindings/3 :: (boolean(), rabbit_types:exchange(), - [rabbit_types:binding()]) -> 'ok'). +-spec(add_binding/3 :: (boolean(), rabbit_types:exchange(), + rabbit_types:binding()) -> 'ok'). -spec(remove_bindings/3 :: (boolean(), rabbit_types:exchange(), [rabbit_types:binding()]) -> 'ok'). -spec(assert_args_equivalence/2 :: diff --git a/src/rabbit_binding.erl b/src/rabbit_binding.erl index 611f7909..0fb0baf3 100644 --- a/src/rabbit_binding.erl +++ b/src/rabbit_binding.erl @@ -114,7 +114,7 @@ recover(XNames, QNames) -> true -> ok = sync_transient_binding(R, fun mnesia:write/3); false -> ok end, - rabbit_exchange:callback(X, add_bindings, [Tx, X, [B]]) + rabbit_exchange:callback(X, add_binding, [Tx, X, B]) end, rabbit_durable_route), ok. @@ -150,7 +150,7 @@ add(Src, Dst, B) -> true -> ok = sync_binding(B, Durable, fun mnesia:write/3), fun (Tx) -> ok = rabbit_exchange:callback( - Src, add_bindings, [Tx, Src, [B]]), + Src, add_binding, [Tx, Src, B]), rabbit_event:notify_if( not Tx, binding_created, info(B)) end; diff --git a/src/rabbit_exchange_type.erl b/src/rabbit_exchange_type.erl index 0fede0be..b2400098 100644 --- a/src/rabbit_exchange_type.erl +++ b/src/rabbit_exchange_type.erl @@ -33,7 +33,7 @@ behaviour_info(callbacks) -> {delete, 3}, %% called after a binding has been added or bindings have been recovered - {add_bindings, 3}, + {add_binding, 3}, %% called after bindings have been deleted. {remove_bindings, 3}, diff --git a/src/rabbit_exchange_type_direct.erl b/src/rabbit_exchange_type_direct.erl index 4c56a1f8..40078b1a 100644 --- a/src/rabbit_exchange_type_direct.erl +++ b/src/rabbit_exchange_type_direct.erl @@ -21,7 +21,7 @@ -export([description/0, route/2]). -export([validate/1, create/2, delete/3, - add_bindings/3, remove_bindings/3, assert_args_equivalence/2]). + add_binding/3, remove_bindings/3, assert_args_equivalence/2]). -include("rabbit_exchange_type_spec.hrl"). -rabbit_boot_step({?MODULE, @@ -42,7 +42,7 @@ route(#exchange{name = Name}, validate(_X) -> ok. create(_Tx, _X) -> ok. delete(_Tx, _X, _Bs) -> ok. -add_bindings(_Tx, _X, _Bs) -> ok. +add_binding(_Tx, _X, _B) -> ok. remove_bindings(_Tx, _X, _Bs) -> ok. assert_args_equivalence(X, Args) -> rabbit_exchange:assert_args_equivalence(X, Args). diff --git a/src/rabbit_exchange_type_fanout.erl b/src/rabbit_exchange_type_fanout.erl index 62568949..f32ef917 100644 --- a/src/rabbit_exchange_type_fanout.erl +++ b/src/rabbit_exchange_type_fanout.erl @@ -20,7 +20,7 @@ -behaviour(rabbit_exchange_type). -export([description/0, route/2]). --export([validate/1, create/2, delete/3, add_bindings/3, +-export([validate/1, create/2, delete/3, add_binding/3, remove_bindings/3, assert_args_equivalence/2]). -include("rabbit_exchange_type_spec.hrl"). @@ -41,7 +41,7 @@ route(#exchange{name = Name}, _Delivery) -> validate(_X) -> ok. create(_Tx, _X) -> ok. delete(_Tx, _X, _Bs) -> ok. -add_bindings(_Tx, _X, _Bs) -> ok. +add_binding(_Tx, _X, _B) -> ok. remove_bindings(_Tx, _X, _Bs) -> ok. assert_args_equivalence(X, Args) -> rabbit_exchange:assert_args_equivalence(X, Args). diff --git a/src/rabbit_exchange_type_headers.erl b/src/rabbit_exchange_type_headers.erl index 258e785a..139feb04 100644 --- a/src/rabbit_exchange_type_headers.erl +++ b/src/rabbit_exchange_type_headers.erl @@ -21,7 +21,7 @@ -behaviour(rabbit_exchange_type). -export([description/0, route/2]). --export([validate/1, create/2, delete/3, add_bindings/3, +-export([validate/1, create/2, delete/3, add_binding/3, remove_bindings/3, assert_args_equivalence/2]). -include("rabbit_exchange_type_spec.hrl"). @@ -115,7 +115,7 @@ headers_match([{PK, PT, PV} | PRest], [{DK, DT, DV} | DRest], validate(_X) -> ok. create(_Tx, _X) -> ok. delete(_Tx, _X, _Bs) -> ok. -add_bindings(_Tx, _X, _Bs) -> ok. +add_binding(_Tx, _X, _B) -> ok. remove_bindings(_Tx, _X, _Bs) -> ok. assert_args_equivalence(X, Args) -> rabbit_exchange:assert_args_equivalence(X, Args). diff --git a/src/rabbit_exchange_type_topic.erl b/src/rabbit_exchange_type_topic.erl index 2c995df8..cdc95226 100644 --- a/src/rabbit_exchange_type_topic.erl +++ b/src/rabbit_exchange_type_topic.erl @@ -21,7 +21,7 @@ -behaviour(rabbit_exchange_type). -export([description/0, route/2]). --export([validate/1, create/2, delete/3, add_bindings/3, +-export([validate/1, create/2, delete/3, add_binding/3, remove_bindings/3, assert_args_equivalence/2]). -include("rabbit_exchange_type_spec.hrl"). @@ -56,12 +56,10 @@ delete(true, #exchange{name = X}, _Bs) -> delete(false, _Exchange, _Bs) -> ok. -add_bindings(true, _X, Bs) -> +add_binding(true, _X, B) -> rabbit_misc:execute_mnesia_transaction( - fun () -> - lists:foreach(fun (B) -> internal_add_binding(B) end, Bs) - end); -add_bindings(false, _X, _Bs) -> + fun () -> internal_add_binding(B) end); +add_binding(false, _X, _B) -> ok. remove_bindings(true, #exchange{name = X}, Bs) -> diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index e618156b..c029412d 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -629,7 +629,7 @@ test_topic_matching() -> {"#.#.#", "t24"}, {"*", "t25"}, {"#.b.#", "t26"}]], - lists:foreach(fun (B) -> exchange_op_callback(X, add_bindings, [[B]]) end, + lists:foreach(fun (B) -> exchange_op_callback(X, add_binding, [B]) end, Bindings), %% test some matches |