diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2013-01-01 20:46:17 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2013-01-01 20:46:17 +0000 |
| commit | 7ae8b196c3c1ff45e6e4c0848da0d2114f82ba4f (patch) | |
| tree | 16aa5f602da2c4c57c0400f0aeacd5b5eab7058c | |
| parent | 7fe40edd67f0a9c6b74663c0d1dbc764b72d95f4 (diff) | |
| download | rabbitmq-server-git-7ae8b196c3c1ff45e6e4c0848da0d2114f82ba4f.tar.gz | |
rename
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 6b8f8c611b..b908361c75 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -722,7 +722,7 @@ drop_expired_msgs(State = #q{dlx = DLX, {Next, State#q{backing_queue_state = BQS1}}; _ -> case rabbit_exchange:lookup(DLX) of {ok, X} -> - drop_expired_messages(ExpirePred, X, State); + dead_letter_expired_msgs(ExpirePred, X, State); {error, not_found} -> {Next, BQS1} = BQ:dropwhile(ExpirePred, BQS), {Next, State#q{backing_queue_state = BQS1}} @@ -733,12 +733,12 @@ drop_expired_msgs(State = #q{dlx = DLX, #message_properties{expiry = Exp} -> Exp end, State1). -drop_expired_messages(ExpirePred, X, State = #q{dlx_routing_key = RK, - publish_seqno = SeqNo0, - unconfirmed = UC0, - queue_monitors = QMons0, - backing_queue_state = BQS, - backing_queue = BQ}) -> +dead_letter_expired_msgs(ExpirePred, X, State = #q{dlx_routing_key = RK, + publish_seqno = SeqNo0, + unconfirmed = UC0, + queue_monitors = QMons0, + backing_queue_state = BQS, + backing_queue = BQ}) -> QName = qname(State), {Next, {ConfirmImm1, SeqNo1, UC1, QMons1}, BQS1} = BQ:fetchwhile( |