diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-04-07 12:40:31 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-04-07 12:40:31 +0100 |
| commit | bda3552956f7dfdf56361eb40afffce7a5c7be2b (patch) | |
| tree | c4672cf465d6d5e54412ee44cca15cee2002f959 | |
| parent | 5e3ffeb9a8f18153917a89ee1696159eebf631c4 (diff) | |
| download | rabbitmq-server-git-bda3552956f7dfdf56361eb40afffce7a5c7be2b.tar.gz | |
Move the inbound tap to before routing but after validation. Remove queues from inbound tap.
| -rw-r--r-- | src/rabbit_channel.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_log.erl | 13 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index d8a7e3d68a..e3dc47dc94 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -604,6 +604,7 @@ handle_method(#'basic.publish'{exchange = ExchangeNameBin, end, case rabbit_basic:message(ExchangeName, RoutingKey, DecodedContent) of {ok, Message} -> + rabbit_log:tap_trace_in(Message), {RoutingRes, DeliveredQPids} = rabbit_exchange:publish( Exchange, @@ -612,8 +613,6 @@ handle_method(#'basic.publish'{exchange = ExchangeNameBin, State2 = process_routing_result(RoutingRes, DeliveredQPids, ExchangeName, MsgSeqNo, Message, State1), - %% TODO is this in the right place? - rabbit_log:tap_trace_in(Message, DeliveredQPids), maybe_incr_stats([{ExchangeName, 1} | [{{QPid, ExchangeName}, 1} || QPid <- DeliveredQPids]], publish, State2), diff --git a/src/rabbit_log.erl b/src/rabbit_log.erl index 25debc4255..18460bdbc9 100644 --- a/src/rabbit_log.erl +++ b/src/rabbit_log.erl @@ -26,7 +26,7 @@ -export([debug/1, debug/2, message/4, info/1, info/2, warning/1, warning/2, error/1, error/2]). --export([tap_trace_in/2, tap_trace_out/3]). +-export([tap_trace_in/1, tap_trace_out/3]). -include("rabbit.hrl"). -include("rabbit_framing.hrl"). @@ -84,21 +84,14 @@ error(Fmt, Args) when is_list(Args) -> tap_trace_in(Message = #basic_message{exchange_name = #resource{ virtual_host = VHostBin, - name = XNameBin}}, - QPids) -> + name = XNameBin}}) -> check_trace( VHostBin, fun (TraceExchangeBin) -> - QInfos = [rabbit_amqqueue:info(#amqqueue{pid = P}, [name]) || - P <- QPids], - QNames = [binary_to_list(N) || - [{name, #resource{name = N}}] <- QInfos], - QNamesStr = list_to_binary(string:join(QNames, ",")), EncodedMessage = message_to_table(Message), maybe_inject(TraceExchangeBin, VHostBin, XNameBin, <<"publish">>, XNameBin, - [{<<"queue_names">>, longstr, QNamesStr}, - {<<"message">>, table, EncodedMessage}]) + [{<<"message">>, table, EncodedMessage}]) end). tap_trace_out({#resource{name = QNameBin}, _QPid, QMsgId, Redelivered, |