diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-02-21 11:04:19 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-02-21 11:04:19 +0000 |
| commit | ab4864be8d11d64d0012597a39ea1c30e8d7db8c (patch) | |
| tree | ae68b3f40b83ab39819206ffce232609ba6fbf0f | |
| parent | b80153559e0bca6d34dcbab56dd5eb0ee269ffd4 (diff) | |
| download | rabbitmq-server-git-ab4864be8d11d64d0012597a39ea1c30e8d7db8c.tar.gz | |
Cosmetic / reduce distance from default.
| -rw-r--r-- | src/rabbit_variable_queue.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index c646a3dff0..a5f1c2122e 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -625,7 +625,7 @@ ack(AckTags, undefined, State) -> lists:foldl( fun (SeqId, {Acc, State2}) -> {MsgStatus, State3} = remove_pending_ack(SeqId, State2), - {accumulate_ack(MsgStatus, Acc), State3} + {accumulate_ack(MsgStatus, Acc), State3} end, {accumulate_ack_init(), State}, AckTags), IndexState1 = rabbit_queue_index:ack(IndexOnDiskSeqIds, IndexState), [ok = msg_store_remove(MSCState, IsPersistent, MsgIds) @@ -646,7 +646,7 @@ ack(AckTags, MsgFun, State = #vqstate{pending_ack = PA}) -> State2 end, State, AckTags)}. -requeue(AckTags, #vqstate { delta = Delta, +requeue(AckTags, #vqstate { delta = Delta, q3 = Q3, q4 = Q4, in_counter = InCounter, @@ -1054,9 +1054,9 @@ queue_out(State = #vqstate { q4 = Q4 }) -> read_msg(MsgStatus = #msg_status { msg = undefined, msg_id = MsgId, is_persistent = IsPersistent }, - State = #vqstate{ ram_msg_count = RamMsgCount, - msg_store_clients = MSCState }) -> - {{ok, Msg = #basic_message{}}, MSCState1} = + State = #vqstate { ram_msg_count = RamMsgCount, + msg_store_clients = MSCState}) -> + {{ok, Msg = #basic_message {}}, MSCState1} = msg_store_read(MSCState, IsPersistent, MsgId), {MsgStatus #msg_status { msg = Msg }, State #vqstate { ram_msg_count = RamMsgCount + 1, |