diff options
| author | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-04-19 15:16:40 +0100 |
|---|---|---|
| committer | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-04-19 15:16:40 +0100 |
| commit | c2cbef7186e47702d5eabc547940b931b16c28af (patch) | |
| tree | 7edd4a00d9d7ccc71607e71272476b23ebbbf0bc /src | |
| parent | 8e28696adc573517e14412c4dc629c09c310e478 (diff) | |
| download | rabbitmq-server-git-c2cbef7186e47702d5eabc547940b931b16c28af.tar.gz | |
ack_nacked_messages -> ack_if_no_dlx
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 2764c02790..0703bffcc0 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -717,12 +717,12 @@ ensure_ttl_timer(State = #q{backing_queue = BQ, ensure_ttl_timer(State) -> State. -ack_nacked_messages(AckTags, State = #q{dlx = undefined, - backing_queue = BQ, - backing_queue_state = BQS }) -> +ack_if_no_dlx(AckTags, State = #q{dlx = undefined, + backing_queue = BQ, + backing_queue_state = BQS }) -> {_Guids, BQS1} = BQ:ack(AckTags, BQS), State#q{backing_queue_state = BQS1}; -ack_nacked_messages(_AckTags, State) -> +ack_if_no_dlx(_AckTags, State) -> State. dead_letter_fun(_Reason, #q{dlx = undefined}) -> @@ -1241,7 +1241,7 @@ handle_cast({reject, AckTags, Requeue, ChPid}, State) -> fun (State1 = #q{backing_queue = BQ, backing_queue_state = BQS}) -> BQS1 = BQ:fold(Fun, BQS, AckTags), - ack_nacked_messages( + ack_if_no_dlx( AckTags, State1#q{backing_queue_state = BQS1}) end end)); |