summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2013-03-17 20:14:47 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2013-03-17 20:14:47 +0000
commit1233f304858989a08c12579248d5e17c858c5dd9 (patch)
tree65d3f8c6663bec42f4ac79fd3a030160625cac48
parentba8dd4cb725663a646ee69faba6bc7c1c185d62e (diff)
downloadrabbitmq-server-bug25495.tar.gz
cosmetic: make callback function def order match usagebug25495
-rw-r--r--src/rabbit_exchange_decorator.erl10
-rw-r--r--src/rabbit_exchange_type.erl12
2 files changed, 11 insertions, 11 deletions
diff --git a/src/rabbit_exchange_decorator.erl b/src/rabbit_exchange_decorator.erl
index b7ef4c45..8f17adfc 100644
--- a/src/rabbit_exchange_decorator.erl
+++ b/src/rabbit_exchange_decorator.erl
@@ -45,6 +45,10 @@
-callback delete(tx(), rabbit_types:exchange(), [rabbit_types:binding()]) ->
'ok'.
+%% called when the policy attached to this exchange changes.
+-callback policy_changed(rabbit_types:exchange(), rabbit_types:exchange()) ->
+ 'ok'.
+
%% called after a binding has been added or recovered
-callback add_binding(serial(), rabbit_types:exchange(),
rabbit_types:binding()) -> 'ok'.
@@ -53,10 +57,6 @@
-callback remove_bindings(serial(), rabbit_types:exchange(),
[rabbit_types:binding()]) -> 'ok'.
-%% called when the policy attached to this exchange changes.
--callback policy_changed(rabbit_types:exchange(), rabbit_types:exchange()) ->
- 'ok'.
-
%% called after exchange routing
%% return value is a list of queues to be added to the list of
%% destination queues. decorators must register separately for
@@ -70,7 +70,7 @@
behaviour_info(callbacks) ->
[{description, 0}, {serialise_events, 1}, {create, 2}, {delete, 3},
- {add_binding, 3}, {remove_bindings, 3}, {policy_changed, 2}, {route, 2}];
+ {policy_changed, 2}, {add_binding, 3}, {remove_bindings, 3}, {route, 2}];
behaviour_info(_Other) ->
undefined.
diff --git a/src/rabbit_exchange_type.erl b/src/rabbit_exchange_type.erl
index fd37631b..ebc59501 100644
--- a/src/rabbit_exchange_type.erl
+++ b/src/rabbit_exchange_type.erl
@@ -48,6 +48,10 @@
-callback delete(tx(), rabbit_types:exchange(), [rabbit_types:binding()]) ->
'ok'.
+%% called when the policy attached to this exchange changes.
+-callback policy_changed(rabbit_types:exchange(), rabbit_types:exchange()) ->
+ 'ok'.
+
%% called after a binding has been added or recovered
-callback add_binding(serial(), rabbit_types:exchange(),
rabbit_types:binding()) -> 'ok'.
@@ -62,19 +66,15 @@
rabbit_framing:amqp_table()) ->
'ok' | rabbit_types:connection_exit().
-%% called when the policy attached to this exchange changes.
--callback policy_changed(rabbit_types:exchange(), rabbit_types:exchange()) ->
- 'ok'.
-
-else.
-export([behaviour_info/1]).
behaviour_info(callbacks) ->
[{description, 0}, {serialise_events, 0}, {route, 2},
- {validate, 1}, {validate_binding, 2},
+ {validate, 1}, {validate_binding, 2}, {policy_changed, 2},
{create, 2}, {delete, 3}, {add_binding, 3}, {remove_bindings, 3},
- {assert_args_equivalence, 2}, {policy_changed, 2}];
+ {assert_args_equivalence, 2}];
behaviour_info(_Other) ->
undefined.