summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Mazzoli <francesco@rabbitmq.com>2012-04-19 15:16:40 +0100
committerFrancesco Mazzoli <francesco@rabbitmq.com>2012-04-19 15:16:40 +0100
commit026e68eef57bcc9905dda740664be393493d7795 (patch)
tree7edd4a00d9d7ccc71607e71272476b23ebbbf0bc
parente133222d58265c805f701661259bf7310aeb32b1 (diff)
downloadrabbitmq-server-026e68eef57bcc9905dda740664be393493d7795.tar.gz
ack_nacked_messages -> ack_if_no_dlx
-rw-r--r--src/rabbit_amqqueue_process.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 2764c027..0703bffc 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));