diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2013-12-24 08:34:56 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2013-12-24 08:34:56 +0000 |
| commit | 8e98fa3d5af09d5efe859c0f60930068d6466835 (patch) | |
| tree | 3756f6487c5b476c296405d76d3b5723b8b5635d /src | |
| parent | a69954357bdfec1367de17c201757e90e0c62d60 (diff) | |
| download | rabbitmq-server-git-8e98fa3d5af09d5efe859c0f60930068d6466835.tar.gz | |
refactor: inline
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 9f7b61434d..886db8d1d3 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -533,10 +533,6 @@ deliver_msg_to_consumer0(DeliverFun, unsent_message_count = Count + 1}), {Stop, State1}. -deliver_from_queue_deliver(AckRequired, State) -> - {Result, State1} = fetch(AckRequired, State), - {Result, is_empty(State1), State1}. - confirm_messages([], State) -> State; confirm_messages(MsgIds, State = #q{msg_id_to_channel = MTC}) -> @@ -583,10 +579,12 @@ discard(#delivery{sender = SenderPid, State1#q{backing_queue_state = BQS1}. run_message_queue(State) -> - {_Active, State1} = deliver_msgs_to_consumers( - fun deliver_from_queue_deliver/2, - is_empty(State), State), - State1. + {_Active, State3} = deliver_msgs_to_consumers( + fun(AckRequired, State1) -> + {Result, State2} = fetch(AckRequired, State1), + {Result, is_empty(State2), State2} + end, is_empty(State), State), + State3. add_consumer({ChPid, Consumer = #consumer{args = Args}}, ActiveConsumers) -> Priority = case rabbit_misc:table_lookup(Args, <<"x-priority">>) of |