summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@rabbitmq.com>2014-06-17 08:12:13 +0400
committerMichael Klishin <michael@rabbitmq.com>2014-06-17 08:12:13 +0400
commit917918ee264a88b36bb665239ea20ffc5344cc08 (patch)
tree4e1ce3d4880dc66ed79390bca9a1ca8b615a9e81
parent7e2a03c67acdb627a5e64bef16e9df88e1d21a64 (diff)
downloadrabbitmq-server-917918ee264a88b36bb665239ea20ffc5344cc08.tar.gz
Include vhost into trace message headers
-rw-r--r--src/rabbit_trace.erl11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/rabbit_trace.erl b/src/rabbit_trace.erl
index aafd81df..017d1ab2 100644
--- a/src/rabbit_trace.erl
+++ b/src/rabbit_trace.erl
@@ -55,14 +55,17 @@ enabled(VHost) ->
lists:member(VHost, VHosts).
tap_in(_Msg, none) -> ok;
-tap_in(Msg = #basic_message{exchange_name = #resource{name = XName}}, TraceX) ->
- trace(TraceX, Msg, <<"publish">>, XName, []).
+tap_in(Msg = #basic_message{exchange_name = #resource{name = XName,
+ virtual_host = VHost}}, TraceX) ->
+ trace(TraceX, Msg, <<"publish">>, XName,
+ [{<<"vhost">>, longstr, VHost}]).
tap_out(_Msg, none) -> ok;
-tap_out({#resource{name = QName}, _QPid, _QMsgId, Redelivered, Msg}, TraceX) ->
+tap_out({#resource{name = QName, virtual_host = VHost}, _QPid, _QMsgId, Redelivered, Msg}, TraceX) ->
RedeliveredNum = case Redelivered of true -> 1; false -> 0 end,
trace(TraceX, Msg, <<"deliver">>, QName,
- [{<<"redelivered">>, signedint, RedeliveredNum}]).
+ [{<<"redelivered">>, signedint, RedeliveredNum},
+ {<<"vhost">>, longstr, VHost}]).
%%----------------------------------------------------------------------------