diff options
| -rw-r--r-- | src/rabbit_channel.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_trace.erl | 21 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index a356f819d0..4efee84a9a 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -671,7 +671,7 @@ handle_method(#'basic.publish'{exchange = ExchangeNameBin, channel = ChannelNum, confirm_enabled = ConfirmEnabled, trace_state = TraceState, - user = #user{username = Username}, + user = #user{username = Username}, conn_name = ConnName}) -> check_msg_size(Content), ExchangeName = rabbit_misc:r(VHostPath, exchange, ExchangeNameBin), diff --git a/src/rabbit_trace.erl b/src/rabbit_trace.erl index c574562f19..f14caf37f8 100644 --- a/src/rabbit_trace.erl +++ b/src/rabbit_trace.erl @@ -59,25 +59,26 @@ enabled(VHost) -> lists:member(VHost, VHosts). tap_in(_Msg, _ConnName, _ChannelNum, _Username, none) -> ok; -tap_in(Msg = #basic_message{exchange_name = #resource{name = XName, +tap_in(Msg = #basic_message{exchange_name = #resource{name = XName, virtual_host = VHost}}, ConnName, ChannelNum, Username, TraceX) -> trace(TraceX, Msg, <<"publish">>, XName, - [{<<"vhost">>, longstr, VHost}, - {<<"connection">>, longstr, ConnName}, - {<<"channel">>, signedint, ChannelNum}, - {<<"user">>, longstr, Username}]). + [{<<"vhost">>, longstr, VHost}, + {<<"connection">>, longstr, ConnName}, + {<<"channel">>, signedint, ChannelNum}, + {<<"user">>, longstr, Username}]). tap_out(_Msg, _ConnName, _ChannelNum, _Username, none) -> ok; -tap_out({#resource{name = QName, virtual_host = VHost}, _QPid, _QMsgId, Redelivered, Msg}, +tap_out({#resource{name = QName, virtual_host = VHost}, + _QPid, _QMsgId, Redelivered, Msg}, ConnName, ChannelNum, Username, TraceX) -> RedeliveredNum = case Redelivered of true -> 1; false -> 0 end, trace(TraceX, Msg, <<"deliver">>, QName, [{<<"redelivered">>, signedint, RedeliveredNum}, - {<<"vhost">>, longstr, VHost}, - {<<"connection">>, longstr, ConnName}, - {<<"channel">>, signedint, ChannelNum}, - {<<"user">>, longstr, Username}]). + {<<"vhost">>, longstr, VHost}, + {<<"connection">>, longstr, ConnName}, + {<<"channel">>, signedint, ChannelNum}, + {<<"user">>, longstr, Username}]). %%---------------------------------------------------------------------------- |