diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2012-02-24 13:10:40 +0000 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2012-02-24 13:10:40 +0000 |
| commit | 90741883151abc631a99629ae98fda8a3f86b025 (patch) | |
| tree | f923b129ee77dce6cf9c3a902d2be6b854f0a005 /src/rabbit_mirror_queue_slave.erl | |
| parent | 2a02ae5f8b5ef1a5635dbe0367c4445a83cbee45 (diff) | |
| download | rabbitmq-server-90741883151abc631a99629ae98fda8a3f86b025.tar.gz | |
rename the weird VQ:ack/3 head to VQ:process_messages/3
Diffstat (limited to 'src/rabbit_mirror_queue_slave.erl')
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index 29a2e8bd..2f72e2ba 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -834,15 +834,20 @@ process_instruction({fetch, AckRequired, MsgId, Remaining}, %% we must be shorter than the master State end}; -process_instruction({ack, MsgFun, MsgIds}, +process_instruction({ack, MsgIds}, State = #state { backing_queue = BQ, backing_queue_state = BQS, msg_id_ack = MA }) -> {AckTags, MA1} = msg_ids_to_acktags(MsgIds, MA), - {MsgIds1, BQS1} = BQ:ack(AckTags, MsgFun, BQS), + {MsgIds1, BQS1} = BQ:ack(AckTags, BQS), [] = MsgIds1 -- MsgIds, %% ASSERTION {ok, State #state { msg_id_ack = MA1, backing_queue_state = BQS1 }}; +process_instruction({process_messages, MsgFun, AckTags}, + State = #state { backing_queue = BQ, + backing_queue_state = BQS }) -> + BQS1 = BQ:process_messages(AckTags, MsgFun, BQS), + {ok, State #state { backing_queue_state = BQS1 }}; process_instruction({requeue, MsgIds}, State = #state { backing_queue = BQ, backing_queue_state = BQS, |