diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2011-10-20 16:22:35 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2011-10-20 16:22:35 +0100 |
| commit | aade042ed7a485c21481bee2ffaf7652652711a2 (patch) | |
| tree | 85a60f29187e5b02d49ee48753abf5e14f2c0751 /src/rabbit_mirror_queue_slave.erl | |
| parent | 54e0b5f85c133dc164a4c927c42a278aabd7dbfa (diff) | |
| download | rabbitmq-server-aade042ed7a485c21481bee2ffaf7652652711a2.tar.gz | |
Refrain from resetting message expiry in message requeue
Diffstat (limited to 'src/rabbit_mirror_queue_slave.erl')
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index f423760a..7182042d 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -827,14 +827,14 @@ process_instruction({ack, MsgIds}, [] = MsgIds1 -- MsgIds, %% ASSERTION {ok, State #state { msg_id_ack = MA1, backing_queue_state = BQS1 }}; -process_instruction({requeue, MsgPropsFun, MsgIds}, +process_instruction({requeue, MsgIds}, State = #state { backing_queue = BQ, backing_queue_state = BQS, msg_id_ack = MA }) -> {AckTags, MA1} = msg_ids_to_acktags(MsgIds, MA), {ok, case length(AckTags) =:= length(MsgIds) of true -> - {MsgIds, BQS1} = BQ:requeue(AckTags, MsgPropsFun, BQS), + {MsgIds, BQS1} = BQ:requeue(AckTags, BQS), State #state { msg_id_ack = MA1, backing_queue_state = BQS1 }; false -> |