diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2012-02-16 18:00:42 +0000 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2012-02-16 18:00:42 +0000 |
| commit | 03b335f12f44427637873e557f6399c30ef28151 (patch) | |
| tree | 337f4468a6ca27d021961257d1bae4e85dfc2049 /src | |
| parent | 477c6f6655f36ad8d9fd03eff37ecf3cec2c4cc0 (diff) | |
| download | rabbitmq-server-git-03b335f12f44427637873e557f6399c30ef28151.tar.gz | |
don't dead-letter on purge
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 46ccc6e268..a4155420e0 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -1218,24 +1218,10 @@ handle_call({delete, IfUnused, IfEmpty}, _From, end; handle_call(purge, _From, State = #q{backing_queue = BQ, - backing_queue_state = BQS, - dlx = undefined}) -> + backing_queue_state = BQS}) -> {Count, BQS1} = BQ:purge(BQS), reply({ok, Count}, State#q{backing_queue_state = BQS1}); -handle_call(purge, From, State = #q{backing_queue = BQ, - backing_queue_state = BQS, - blocked_ops = Ops}) -> - BQS1 = BQ:dropwhile(fun (_) -> true end, - mk_dead_letter_fun(queue_purged, State), - BQS), - case BQ:len(BQS) of - 0 -> reply({ok, 0}, State#q{backing_queue_state = BQS1}); - _ -> noreply( - State#q{backing_queue_state = BQS1, - blocked_ops = [{purge, {From, BQ:len(BQS)}} | Ops]}) - end; - handle_call({requeue, AckTags, ChPid}, From, State) -> gen_server2:reply(From, ok), noreply(subtract_acks( |