diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-04-11 12:38:39 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-04-11 12:38:39 +0100 |
| commit | 90629640580f5ec1300ef52db73231696b885e39 (patch) | |
| tree | c46e3a58a608471c1f013dffcfc1aaad855bdd2b | |
| parent | 3cf667e6bf9d44e6195a331026f28ae3cdf3cb79 (diff) | |
| download | rabbitmq-server-90629640580f5ec1300ef52db73231696b885e39.tar.gz | |
Remove delivery tag.
| -rw-r--r-- | src/rabbit_channel.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_trace.erl | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 6ec2a09f..8a234c0f 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -280,7 +280,7 @@ handle_cast({deliver, ConsumerTag, AckRequired, true -> deliver; false -> deliver_no_ack end, State), - rabbit_trace:tap_trace_out(Msg, DeliveryTag, ConsumerTag), + rabbit_trace:tap_trace_out(Msg, ConsumerTag), noreply(State1#ch{next_tag = DeliveryTag + 1}); handle_cast(emit_stats, State = #ch{stats_timer = StatsTimer}) -> @@ -673,7 +673,7 @@ handle_method(#'basic.get'{queue = QueueNameBin, true -> get_no_ack; false -> get end, State), - rabbit_trace:tap_trace_out(Msg, DeliveryTag, none), + rabbit_trace:tap_trace_out(Msg, none), ok = rabbit_writer:send_command( WriterPid, #'basic.get_ok'{delivery_tag = DeliveryTag, diff --git a/src/rabbit_trace.erl b/src/rabbit_trace.erl index 2ef28be8..6163d14a 100644 --- a/src/rabbit_trace.erl +++ b/src/rabbit_trace.erl @@ -16,7 +16,7 @@ -module(rabbit_trace). --export([tap_trace_in/1, tap_trace_out/3]). +-export([tap_trace_in/1, tap_trace_out/2]). -include("rabbit.hrl"). -include("rabbit_framing.hrl"). @@ -25,10 +25,8 @@ -ifdef(use_specs). --type(delivery_tag() :: pos_integer()). - -spec(tap_trace_in/1 :: (rabbit_types:basic_message()) -> 'ok'). --spec(tap_trace_out/3 :: (rabbit_amqqueue:qmsg(), delivery_tag(), +-spec(tap_trace_out/2 :: (rabbit_amqqueue:qmsg(), rabbit_types:maybe(rabbit_types:ctag())) -> 'ok'). -endif. @@ -51,7 +49,6 @@ tap_trace_out({#resource{name = QNameBin}, _QPid, _QMsgId, Redelivered, Message = #basic_message{ exchange_name = #resource{virtual_host = VHostBin, name = XNameBin}}}, - DeliveryTag, ConsumerTagOrNone) -> check_trace( XNameBin, @@ -59,8 +56,7 @@ tap_trace_out({#resource{name = QNameBin}, _QPid, _QMsgId, Redelivered, fun (TraceExchangeBin) -> RedeliveredNum = case Redelivered of true -> 1; false -> 0 end, {EncodedMetadata, Payload} = message_to_table(Message), - Fields0 = [{<<"delivery_tag">>, signedint, DeliveryTag}, - {<<"redelivered">>, signedint, RedeliveredNum}] + Fields0 = [{<<"redelivered">>, signedint, RedeliveredNum}] ++ EncodedMetadata, Fields = case ConsumerTagOrNone of none -> Fields0; |