diff options
| author | Ben Hood <0x6e6562@gmail.com> | 2008-09-27 21:22:06 +0100 |
|---|---|---|
| committer | Ben Hood <0x6e6562@gmail.com> | 2008-09-27 21:22:06 +0100 |
| commit | a8406804dd4120fc04807e9e655d4706da980696 (patch) | |
| tree | d238d2ce58ca0b5b52361b8611e1fd0b3694497f | |
| parent | 02bc9f71c3546e2982b25b7bdce2b1bbd218fbff (diff) | |
| download | rabbitmq-server-a8406804dd4120fc04807e9e655d4706da980696.tar.gz | |
Swapped position of exchange and queue in binding APIs
| -rw-r--r-- | src/rabbit_amqqueue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_exchange.erl | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index df41a5c6..a0d8d308 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -159,7 +159,7 @@ recover_queue(Q) -> add_default_binding(#amqqueue{name = QueueName}) -> Exchange = rabbit_misc:r(QueueName, exchange, <<>>), RoutingKey = QueueName#resource.name, - rabbit_exchange:add_binding(QueueName, Exchange, RoutingKey, []), + rabbit_exchange:add_binding(Exchange, QueueName, RoutingKey, []), ok. lookup(Name) -> diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index b8abc8cc..ddd0ecf4 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -580,7 +580,7 @@ handle_method(#'queue.bind'{queue = QueueNameBin, ActualRoutingKey = expand_routing_key_shortcut(QueueNameBin, RoutingKey, State), ExchangeName = rabbit_misc:r(VHostPath, exchange, ExchangeNameBin), - case rabbit_exchange:add_binding(QueueName, ExchangeName, + case rabbit_exchange:add_binding(ExchangeName, QueueName, ActualRoutingKey, Arguments) of {error, queue_not_found} -> rabbit_misc:protocol_error( diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 2cc570db..216b8dd4 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -70,10 +70,10 @@ {'error', 'durability_settings_incompatible'}). -spec(delete_binding/1 :: (binding()) -> 'ok' | not_found()). -spec(add_binding/4 :: - (queue_name(), exchange_name(), routing_key(), amqp_table()) -> + (exchange_name(), queue_name(), routing_key(), amqp_table()) -> bind_res() | {'error', 'durability_settings_incompatible'}). -spec(delete_binding/4 :: - (queue_name(), exchange_name(), routing_key(), amqp_table()) -> + (exchange_name(), queue_name(), routing_key(), amqp_table()) -> bind_res() | {'error', 'binding_not_found'}). -spec(delete_bindings/1 :: (queue_name()) -> 'ok' | not_found()). -spec(topic_matches/2 :: (binary(), binary()) -> bool()). @@ -255,13 +255,13 @@ call_with_exchange_and_queue(#binding{exchange_name = Exchange, end. -add_binding(QueueName, ExchangeName, RoutingKey, _Arguments) -> +add_binding(ExchangeName, QueueName, RoutingKey, _Arguments) -> Binding = #binding{exchange_name = ExchangeName, key = RoutingKey, queue_name = QueueName}, rabbit_misc:execute_mnesia_transaction(fun add_binding/1, [Binding]). -delete_binding(QueueName, ExchangeName, RoutingKey, _Arguments) -> +delete_binding(ExchangeName, QueueName, RoutingKey, _Arguments) -> Binding = #binding{exchange_name = ExchangeName, key = RoutingKey, queue_name = QueueName}, |