diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-02-21 11:03:09 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-02-21 11:03:09 +0000 |
| commit | b80153559e0bca6d34dcbab56dd5eb0ee269ffd4 (patch) | |
| tree | f9a1bfef60fd8f85b9ed85a9c9bd92711fb3d660 | |
| parent | e600b1ebee482e4bfa192daff14ca4b92efbd3e9 (diff) | |
| download | rabbitmq-server-git-b80153559e0bca6d34dcbab56dd5eb0ee269ffd4.tar.gz | |
I don't think the mk_ prefix helps us here.
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 379a0bf758..73cd599b90 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -709,7 +709,7 @@ drop_expired_messages(State = #q{backing_queue_state = BQS, Now = now_micros(), BQS1 = BQ:dropwhile( fun (#message_properties{expiry = Expiry}) -> Now > Expiry end, - mk_dead_letter_fun(expired, State), + dead_letter_fun(expired, State), BQS), ensure_ttl_timer(State#q{backing_queue_state = BQS1}). @@ -726,9 +726,9 @@ ensure_ttl_timer(State = #q{backing_queue = BQ, ensure_ttl_timer(State) -> State. -mk_dead_letter_fun(_Reason, #q{dlx = undefined}) -> +dead_letter_fun(_Reason, #q{dlx = undefined}) -> undefined; -mk_dead_letter_fun(Reason, _State) -> +dead_letter_fun(Reason, _State) -> fun(Msg, AckTag) -> gen_server2:cast(self(), {dead_letter, {Msg, AckTag}, Reason}) end. @@ -1294,7 +1294,7 @@ handle_cast({reject, AckTags, Requeue, ChPid}, State) -> backing_queue_state = BQS}) -> case Requeue of true -> requeue_and_run(AckTags, State1); - false -> Fun = mk_dead_letter_fun(rejected, State), + false -> Fun = dead_letter_fun(rejected, State), {_Guids, BQS1} = BQ:ack(AckTags, Fun, BQS), State1#q{backing_queue_state = BQS1} |