diff options
| author | Diana Corbacho <diana@rabbitmq.com> | 2018-12-04 16:00:23 +0000 |
|---|---|---|
| committer | Diana Corbacho <diana@rabbitmq.com> | 2018-12-04 16:00:23 +0000 |
| commit | cd070eecc2cab733a77ffeca27cf819d8789b87f (patch) | |
| tree | a6c1f34f99b0ee28feaf87c53eb650a7f3ec676d | |
| parent | 9cd1e0dc4667ced9a401bdc4d2392eeaaab9edbe (diff) | |
| download | rabbitmq-server-git-cd070eecc2cab733a77ffeca27cf819d8789b87f.tar.gz | |
Rename x-redelivery-count to x-delivery-count to align with AMQP1.0
[#161057187]
| -rw-r--r-- | src/rabbit_channel.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_quorum_queue.erl | 2 | ||||
| -rw-r--r-- | test/quorum_queue_SUITE.erl | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 2671a1b76e..bc273bf100 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -2492,4 +2492,4 @@ maybe_monitor_all(Items, S) -> lists:foldl(fun maybe_monitor/2, S, Items). add_delivery_count_header(MsgHeader, Msg) -> Count = maps:get(delivery_count, MsgHeader, 0), - rabbit_basic:add_header(<<"x-redelivery-count">>, long, Count, Msg). + rabbit_basic:add_header(<<"x-delivery-count">>, long, Count, Msg). diff --git a/src/rabbit_quorum_queue.erl b/src/rabbit_quorum_queue.erl index ab28fadf53..b1c57fe587 100644 --- a/src/rabbit_quorum_queue.erl +++ b/src/rabbit_quorum_queue.erl @@ -333,7 +333,7 @@ basic_get(#amqqueue{name = QName, pid = {Name, _} = Id, type = quorum}, NoAck, {ok, {MsgId, {MsgHeader, Msg0}}, QState} -> Count = maps:get(delivery_count, MsgHeader, 0), IsDelivered = Count > 0, - Msg = rabbit_basic:add_header(<<"x-redelivery-count">>, long, Count, Msg0), + Msg = rabbit_basic:add_header(<<"x-delivery-count">>, long, Count, Msg0), {ok, quorum_messages(Name), {QName, Id, MsgId, IsDelivered, Msg}, QState}; {timeout, _} -> {error, timeout} diff --git a/test/quorum_queue_SUITE.erl b/test/quorum_queue_SUITE.erl index 4a1fb08dce..84a0bf9695 100644 --- a/test/quorum_queue_SUITE.erl +++ b/test/quorum_queue_SUITE.erl @@ -1650,7 +1650,7 @@ subscribe_redelivery_count(Config) -> wait_for_messages_pending_ack(Servers, RaName, 0), subscribe(Ch, QQ, false), - DTag = <<"x-redelivery-count">>, + DTag = <<"x-delivery-count">>, receive {#'basic.deliver'{delivery_tag = DeliveryTag, redelivered = false}, @@ -1695,7 +1695,7 @@ consume_redelivery_count(Config) -> wait_for_messages_ready(Servers, RaName, 1), wait_for_messages_pending_ack(Servers, RaName, 0), - DTag = <<"x-redelivery-count">>, + DTag = <<"x-delivery-count">>, {#'basic.get_ok'{delivery_tag = DeliveryTag, redelivered = false}, |