diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2013-12-24 13:05:00 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2013-12-24 13:05:00 +0000 |
| commit | 99ff4f69085053f9c5f2e043f28f4a5436e6528c (patch) | |
| tree | 5fc9c8422965ffc6c6c1f3c9799cdc74faa754c8 /src | |
| parent | 1741bbd334a2fb826ed2c2e2c1c63b004a4523bf (diff) | |
| download | rabbitmq-server-git-99ff4f69085053f9c5f2e043f28f4a5436e6528c.tar.gz | |
refactor: better var name
DeliverFun wasn't deliverying anything. It was just getting hold of a
message *to* deliver. -> FetchFun
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_queue_consumers.erl | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 6a22361068..6c877cc50f 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -409,10 +409,10 @@ maybe_send_drained(WasEmpty, State) -> end, State. -deliver_msgs_to_consumers(DeliverFun, Stop, State) -> +deliver_msgs_to_consumers(FetchFun, Stop, State = #q{consumers = Consumers}) -> {Active, Blocked, State1, Consumers1} = - rabbit_queue_consumers:deliver(DeliverFun, Stop, qname(State), State, - State#q.consumers), + rabbit_queue_consumers:deliver(FetchFun, Stop, qname(State), State, + Consumers), State2 = State1#q{consumers = Consumers1}, [notify_decorators(consumer_blocked, [{consumer_tag, CTag}], State2) || {_ChPid, CTag} <- Blocked], diff --git a/src/rabbit_queue_consumers.erl b/src/rabbit_queue_consumers.erl index a2a699aae5..d5d2a15033 100644 --- a/src/rabbit_queue_consumers.erl +++ b/src/rabbit_queue_consumers.erl @@ -168,23 +168,23 @@ erase_ch(ChPid, Consumers) -> send_drained() -> [update_ch_record(send_drained(C)) || C <- all_ch_record()], ok. -deliver(DeliverFun, Stop, QName, S, Consumers) -> - deliver(DeliverFun, Stop, QName, [], S, Consumers). +deliver(FetchFun, Stop, QName, S, Consumers) -> + deliver(FetchFun, Stop, QName, [], S, Consumers). -deliver(_DeliverFun, true, _QName, Blocked, S, Consumers) -> +deliver(_FetchFun, true, _QName, Blocked, S, Consumers) -> {true, Blocked, S, Consumers}; -deliver( DeliverFun, false, QName, Blocked, S, Consumers) -> +deliver( FetchFun, false, QName, Blocked, S, Consumers) -> case priority_queue:out_p(Consumers) of {empty, _} -> {false, Blocked, S, Consumers}; {{value, QEntry, Priority}, Tail} -> {Stop, Blocked1, S1, Consumers1} = - deliver_to_consumer(DeliverFun, QEntry, Priority, QName, + deliver_to_consumer(FetchFun, QEntry, Priority, QName, Blocked, S, Tail), - deliver(DeliverFun, Stop, QName, Blocked1, S1, Consumers1) + deliver(FetchFun, Stop, QName, Blocked1, S1, Consumers1) end. -deliver_to_consumer(DeliverFun, E = {ChPid, Consumer}, Priority, QName, +deliver_to_consumer(FetchFun, E = {ChPid, Consumer}, Priority, QName, Blocked, S, Consumers) -> C = lookup_ch(ChPid), case is_ch_blocked(C) of @@ -200,21 +200,21 @@ deliver_to_consumer(DeliverFun, E = {ChPid, Consumer}, Priority, QName, {false, Blocked1, S, Consumers}; {continue, Limiter} -> {Stop, S1} = deliver_to_consumer( - DeliverFun, Consumer, + FetchFun, Consumer, C#cr{limiter = Limiter}, QName, S), {Stop, Blocked, S1, priority_queue:in(E, Priority, Consumers)} end end. -deliver_to_consumer(DeliverFun, +deliver_to_consumer(FetchFun, #consumer{tag = ConsumerTag, ack_required = AckRequired}, C = #cr{ch_pid = ChPid, acktags = ChAckTags, unsent_message_count = Count}, QName, S) -> - {{Message, IsDelivered, AckTag}, Stop, S1} = DeliverFun(AckRequired, S), + {{Message, IsDelivered, AckTag}, Stop, S1} = FetchFun(AckRequired, S), rabbit_channel:deliver(ChPid, ConsumerTag, AckRequired, {QName, self(), AckTag, IsDelivered, Message}), ChAckTags1 = case AckRequired of |