diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-08-25 18:57:55 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-08-25 18:57:55 +0100 |
| commit | b55a93fcc13158059a4802ab7578cb85848aece9 (patch) | |
| tree | d45f76476a9985269c9278192700861ca9138c89 /src | |
| parent | 50c2ff42295033080ce329cbdcc2b3ce7006cb5a (diff) | |
| download | rabbitmq-server-git-b55a93fcc13158059a4802ab7578cb85848aece9.tar.gz | |
delete_now -> delete
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index a0e0744ecd..210602d39b 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -360,7 +360,7 @@ emit_stats(#amqqueue{pid = QPid}) -> delegate_cast(QPid, emit_stats). delete(#amqqueue{ pid = QPid }) -> - gen_server2:call(QPid, delete_now, infinity). + gen_server2:call(QPid, delete, infinity). delete(#amqqueue{ pid = QPid }, IfUnused, IfEmpty) -> delegate_call(QPid, {delete, IfUnused, IfEmpty}, infinity). diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 986fd70af7..fd5945742b 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -598,7 +598,7 @@ prioritise_call(Msg, _From, _State) -> info -> 9; {info, _Items} -> 9; consumers -> 9; - delete_now -> 9; + delete -> 9; {maybe_run_queue_via_backing_queue, _Fun} -> 6; _ -> 0 end. @@ -618,7 +618,7 @@ prioritise_cast(Msg, _State) -> end. prioritise_info({'DOWN', _MonitorRef, process, DownPid, _Reason}, - State = #q{q = #amqqueue{exclusive_owner = DownPid}}) -> + #q{q = #amqqueue{exclusive_owner = DownPid}}) -> 9; prioritise_info(_Msg, _State) -> 0. @@ -792,8 +792,8 @@ handle_call(stat, _From, State = #q{backing_queue = BQ, active_consumers = ActiveConsumers}) -> reply({ok, BQ:len(BQS), queue:len(ActiveConsumers)}, State); -handle_call(delete_now, _From, State = #q{ backing_queue_state = BQS, - backing_queue = BQ }) -> +handle_call(delete, _From, State = #q{ backing_queue_state = BQS, + backing_queue = BQ }) -> {stop, normal, {ok, BQ:len(BQS)}, State}; handle_call({delete, IfUnused, IfEmpty}, _From, |