Skip to content

Commit 0ec29e0

Browse files
committed
Introduce new dlx reason for delivery limit
Called `delivery_limit` [#163513253]
1 parent fecd996 commit 0ec29e0

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/rabbit_dead_letter.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
%%----------------------------------------------------------------------------
2525

26-
-type reason() :: 'expired' | 'rejected' | 'maxlen'.
26+
-type reason() :: 'expired' | 'rejected' | 'maxlen' | delivery_limit.
2727

2828
%%----------------------------------------------------------------------------
2929

src/rabbit_fifo.erl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ drop_head(#?MODULE{ra_indexes = Indexes0} = State0, Effects0) ->
824824
Indexes = rabbit_fifo_index:delete(RaftIdxToDrop, Indexes0),
825825
Bytes = message_size(Msg),
826826
State = add_bytes_drop(Bytes, State1#?MODULE{ra_indexes = Indexes}),
827-
Effects = dead_letter_effects(maxlen, maps:put(none, FullMsg, #{}),
827+
Effects = dead_letter_effects(maxlen, #{none => FullMsg},
828828
State, Effects0),
829829
{State, Effects};
830830
{{'$prefix_msg', #{size := Bytes}}, State1} ->
@@ -1074,7 +1074,8 @@ return_one(MsgNum, {RaftId, {Header0, RawMsg}},
10741074
case maps:get(delivery_count, Header) of
10751075
DeliveryCount when DeliveryCount > DeliveryLimit ->
10761076
DlMsg = {MsgNum, Msg},
1077-
Effects = dead_letter_effects(rejected, maps:put(none, DlMsg, #{}),
1077+
Effects = dead_letter_effects(delivery_limit,
1078+
#{none => DlMsg},
10781079
State0, Effects0),
10791080
Checked = Con#consumer.checked_out,
10801081
{State1, Effects1} = complete(ConsumerId, [RaftId], 1, Con, Checked,

0 commit comments

Comments
 (0)