diff options
| author | Michael Klishin <michael@rabbitmq.com> | 2014-06-19 16:56:02 +0400 |
|---|---|---|
| committer | Michael Klishin <michael@rabbitmq.com> | 2014-06-19 16:56:02 +0400 |
| commit | aa810e595f1448dc255733cc49bf92dc1b58f668 (patch) | |
| tree | 14cd3826a808c382aa6c0423d9c47860816c395f /src/rabbit_channel.erl | |
| parent | 5a939f21b7e0f450cb40c7791de356fd756057e1 (diff) | |
| download | rabbitmq-server-aa810e595f1448dc255733cc49bf92dc1b58f668.tar.gz | |
Include channel into trace messages
Diffstat (limited to 'src/rabbit_channel.erl')
| -rw-r--r-- | src/rabbit_channel.erl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index ac989d62..a356f819 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -668,6 +668,7 @@ handle_method(#'basic.publish'{exchange = ExchangeNameBin, mandatory = Mandatory}, Content, State = #ch{virtual_host = VHostPath, tx = Tx, + channel = ChannelNum, confirm_enabled = ConfirmEnabled, trace_state = TraceState, user = #user{username = Username}, @@ -692,7 +693,8 @@ handle_method(#'basic.publish'{exchange = ExchangeNameBin, end, case rabbit_basic:message(ExchangeName, RoutingKey, DecodedContent) of {ok, Message} -> - rabbit_trace:tap_in(Message, ConnName, Username, TraceState), + rabbit_trace:tap_in(Message, ConnName, ChannelNum, + Username, TraceState), Delivery = rabbit_basic:delivery( Mandatory, DoConfirm, Message, MsgSeqNo), QNames = rabbit_exchange:route(Exchange, Delivery), @@ -1369,7 +1371,8 @@ record_sent(ConsumerTag, AckRequired, next_tag = DeliveryTag, trace_state = TraceState, user = #user{username = Username}, - conn_name = ConnName}) -> + conn_name = ConnName, + channel = ChannelNum}) -> ?INCR_STATS([{queue_stats, QName, 1}], case {ConsumerTag, AckRequired} of {none, true} -> get; {none, false} -> get_no_ack; @@ -1380,7 +1383,7 @@ record_sent(ConsumerTag, AckRequired, true -> ?INCR_STATS([{queue_stats, QName, 1}], redeliver, State); false -> ok end, - rabbit_trace:tap_out(Msg, ConnName, Username, TraceState), + rabbit_trace:tap_out(Msg, ConnName, ChannelNum, Username, TraceState), UAMQ1 = case AckRequired of true -> queue:in({DeliveryTag, ConsumerTag, {QPid, MsgId}}, UAMQ); |