diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-10-13 14:24:18 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-10-13 14:24:18 +0100 |
| commit | 2520f4c9992529f7203bad1431d4159a630b512d (patch) | |
| tree | 5c021e20559a4435297533492045d5b4374da156 | |
| parent | c676f190856a704e5c19e1cbe76e69d8375e68c9 (diff) | |
| download | rabbitmq-server-git-2520f4c9992529f7203bad1431d4159a630b512d.tar.gz | |
Removal of log entry; correction of stats; assertion that QC can only get delete_all msg once
| -rw-r--r-- | src/rabbit_amqqueue.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_queue_collector.erl | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index cce3c18a0f..4e82ac9ba1 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -115,9 +115,7 @@ (rabbit_types:amqqueue()) -> {'ok', non_neg_integer(), non_neg_integer()}). -spec(emit_stats/1 :: (rabbit_types:amqqueue()) -> 'ok'). --spec(delete_immediately/1 :: (rabbit_types:amqqueue()) - -> rabbit_types:ok_or_error2(qlen(), - 'not_exclusive')). +-spec(delete_immediately/1 :: (rabbit_types:amqqueue()) -> 'ok'). -spec(delete/3 :: (rabbit_types:amqqueue(), 'false', 'false') -> qlen(); diff --git a/src/rabbit_queue_collector.erl b/src/rabbit_queue_collector.erl index e3c8d67146..e5215660c1 100644 --- a/src/rabbit_queue_collector.erl +++ b/src/rabbit_queue_collector.erl @@ -66,7 +66,7 @@ delete_all(CollectorPid) -> %%---------------------------------------------------------------------------- init([]) -> - {ok, #state{queues = dict:new()}}. + {ok, #state{queues = dict:new(), delete_from = undefined}}. %%-------------------------------------------------------------------------- @@ -79,7 +79,8 @@ handle_call({register, Q}, _From, end, {reply, ok, State#state{queues = dict:store(MonitorRef, Q, Queues)}}; -handle_call(delete_all, From, State = #state{queues = Queues}) -> +handle_call(delete_all, From, State = #state{queues = Queues, + delete_from = undefined}) -> case dict:size(Queues) of 0 -> {reply, ok, State#state{delete_from = From}}; _ -> [rabbit_amqqueue:delete_immediately(Q) @@ -99,7 +100,6 @@ handle_info({'DOWN', MonitorRef, process, _DownPid, _Reason}, {noreply, State#state{queues = dict:erase(MonitorRef, Queues)}}. terminate(_Reason, _State) -> - rabbit_log:info("collector terminated~n"), ok. code_change(_OldVsn, State, _Extra) -> |