diff options
| author | Michael Klishin <michael@rabbitmq.com> | 2014-06-17 09:34:38 +0400 |
|---|---|---|
| committer | Michael Klishin <michael@rabbitmq.com> | 2014-06-17 09:34:38 +0400 |
| commit | 639b03bd7e823d90bd3c35a821593926a1ce368d (patch) | |
| tree | 3fb113cf5b88066a2d984040b4531c72a308e53d | |
| parent | 35d8256700c50c456ca4072400a9e5a9f6cbc6d7 (diff) | |
| download | rabbitmq-server-git-639b03bd7e823d90bd3c35a821593926a1ce368d.tar.gz | |
backout bd87cb0026c5 (wrong branch)
| -rw-r--r-- | src/rabbit_trace.erl | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/rabbit_trace.erl b/src/rabbit_trace.erl index afb149d015..53823b20b6 100644 --- a/src/rabbit_trace.erl +++ b/src/rabbit_trace.erl @@ -54,22 +54,15 @@ enabled(VHost) -> {ok, VHosts} = application:get_env(rabbit, ?TRACE_VHOSTS), lists:member(VHost, VHosts). -tap_in(_Msg, _Username, none) -> ok; -tap_in(Msg = #basic_message{exchange_name = #resource{name = XName, - virtual_host = VHost}}, - Username, TraceX) -> - trace(TraceX, Msg, <<"publish">>, XName, - [{<<"vhost">>, longstr, VHost}, - {<<"user">>, longstr, Username}]). - -tap_out(_Msg, _Username, none) -> ok; -tap_out({#resource{name = QName, virtual_host = VHost}, _QPid, _QMsgId, Redelivered, Msg}, - Username, TraceX) -> +tap_in(_Msg, none) -> ok; +tap_in(Msg = #basic_message{exchange_name = #resource{name = XName}}, TraceX) -> + trace(TraceX, Msg, <<"publish">>, XName, []). + +tap_out(_Msg, none) -> ok; +tap_out({#resource{name = QName}, _QPid, _QMsgId, Redelivered, Msg}, TraceX) -> RedeliveredNum = case Redelivered of true -> 1; false -> 0 end, trace(TraceX, Msg, <<"deliver">>, QName, - [{<<"redelivered">>, signedint, RedeliveredNum}, - {<<"vhost">>, longstr, VHost}, - {<<"user">>, longstr, Username}]). + [{<<"redelivered">>, signedint, RedeliveredNum}]). %%---------------------------------------------------------------------------- |