@@ -332,7 +332,7 @@ apply(Meta, #discard{msg_ids = MsgIds, consumer_id = ConsumerId},
332
332
case Cons0 of
333
333
#{ConsumerId := Con0 } ->
334
334
Discarded = maps :with (MsgIds , Con0 # consumer .checked_out ),
335
- Effects = dead_letter_effects (Discarded , State0 , []),
335
+ Effects = dead_letter_effects (rejected , Discarded , State0 , []),
336
336
complete_and_checkout (Meta , MsgIds , ConsumerId , Con0 ,
337
337
Effects , State0 );
338
338
_ ->
@@ -948,7 +948,7 @@ drop_head(#state{ra_indexes = Indexes0} = State0, Effects0) ->
948
948
Indexes = rabbit_fifo_index :delete (RaftIdxToDrop , Indexes0 ),
949
949
Bytes = message_size (Msg ),
950
950
State = add_bytes_drop (Bytes , State1 # state {ra_indexes = Indexes }),
951
- Effects = dead_letter_effects (maps :put (none , FullMsg , #{}),
951
+ Effects = dead_letter_effects (maxlen , maps :put (none , FullMsg , #{}),
952
952
State , Effects0 ),
953
953
{State , Effects };
954
954
{{'$prefix_msg' , Bytes }, State1 } ->
@@ -1099,15 +1099,15 @@ complete_and_checkout(#{index := IncomingRaftIdx} = Meta, MsgIds, ConsumerId,
1099
1099
% settle metrics are incremented separately
1100
1100
update_smallest_raft_index (IncomingRaftIdx , Indexes0 , State , Effects ).
1101
1101
1102
- dead_letter_effects (_Discarded ,
1102
+ dead_letter_effects (_Reason , _Discarded ,
1103
1103
# state {dead_letter_handler = undefined },
1104
1104
Effects ) ->
1105
1105
Effects ;
1106
- dead_letter_effects (Discarded ,
1106
+ dead_letter_effects (Reason , Discarded ,
1107
1107
# state {dead_letter_handler = {Mod , Fun , Args }}, Effects ) ->
1108
1108
DeadLetters = maps :fold (fun (_ , {_ , {_ , {_Header , Msg }}},
1109
1109
% MsgId, MsgIdID, RaftId, Header
1110
- Acc ) -> [{rejected , Msg } | Acc ]
1110
+ Acc ) -> [{Reason , Msg } | Acc ]
1111
1111
end , [], Discarded ),
1112
1112
[{mod_call , Mod , Fun , Args ++ [DeadLetters ]} | Effects ].
1113
1113
0 commit comments