diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-01-10 12:27:10 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-01-10 12:27:10 +0000 |
| commit | 09b278d9093a83c8c7dbb283408f3311de85efd7 (patch) | |
| tree | e4258304f96e5560a07924b8c1483d657549dd23 | |
| parent | 6562b9f4480664929a6eb7279189559e751544ff (diff) | |
| download | rabbitmq-server-09b278d9093a83c8c7dbb283408f3311de85efd7.tar.gz | |
Cosmetic, inline.
| -rw-r--r-- | src/rabbit_channel.erl | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index b3fc17b0..43471eb7 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -272,7 +272,8 @@ handle_cast({method, Method, Content, Flow}, flow -> credit_flow:ack(Reader); noflow -> ok end, - try handle_method(intercept_method(Method, State), + try handle_method(rabbit_channel_interceptor:intercept_method( + expand_shortcuts(Method, State)), Content, State) of {reply, Reply, NewState} -> ok = send(Reply, NewState), @@ -553,10 +554,10 @@ expand_shortcuts(#'queue.delete' {queue = Q} = M, State) -> expand_shortcuts(#'queue.purge' {queue = Q} = M, State) -> M#'queue.purge' {queue = expand_queue_name_shortcut(Q, State)}; expand_shortcuts(#'queue.bind' {queue = Q, routing_key = K} = M, State) -> - M#'queue.bind' {queue = expand_queue_name_shortcut(Q, State), + M#'queue.bind' {queue = expand_queue_name_shortcut(Q, State), routing_key = expand_routing_key_shortcut(Q, K, State)}; expand_shortcuts(#'queue.unbind' {queue = Q, routing_key = K} = M, State) -> - M#'queue.unbind' {queue = expand_queue_name_shortcut(Q, State), + M#'queue.unbind' {queue = expand_queue_name_shortcut(Q, State), routing_key = expand_routing_key_shortcut(Q, K, State)}; expand_shortcuts(M, _State) -> M. @@ -1694,8 +1695,3 @@ erase_queue_stats(QName) -> [erase({queue_exchange_stats, QX}) || {{queue_exchange_stats, QX = {QName0, _}}, _} <- get(), QName0 =:= QName]. - -intercept_method(Method, State) -> - %% handle MRDQ before calling intercept_method - rabbit_channel_interceptor:intercept_method( - expand_shortcuts(Method, State)).
\ No newline at end of file |