diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-07-19 14:56:34 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-07-19 14:56:34 +0100 |
| commit | 5d1744d3b0b262bf3fd29cfccf5c9b70e77f5f12 (patch) | |
| tree | fe8b097cfa3b6a80d9324389c12ad580aaad151e /src | |
| parent | 1d07d00858a7cfa221de04f8b658caf34ba5412e (diff) | |
| download | rabbitmq-server-git-5d1744d3b0b262bf3fd29cfccf5c9b70e77f5f12.tar.gz | |
Make channel monitor queues for which it is gathering statistics, and remove the stats when the queue goes away.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_channel.erl | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 44699af6d5..dd7c5d4f5f 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -269,7 +269,9 @@ handle_info({'EXIT', WriterPid, Reason = {writer, send_failed, _Error}}, handle_info({'EXIT', _Pid, Reason}, State) -> {stop, Reason, State}; handle_info({'DOWN', _MRef, process, QPid, _Reason}, State) -> - {noreply, queue_blocked(QPid, State)}. + State1 = queue_blocked(QPid, State), + State2 = erase_stats(QPid, State1), + {noreply, State2}. handle_pre_hibernate(State) -> ok = clear_permission_cache(), @@ -1163,6 +1165,10 @@ incr_exchange_stats(ExchangeName, State = #ch{exchange_statistics = Stats}) -> incr_queue_stats(Counts, Key, State = #ch{queue_statistics = Stats}) -> Stats1 = lists:foldl( fun ({QPid, Incr}, Stats0) -> + case dict:is_key(QPid, Stats0) of + false -> erlang:monitor(process, QPid); + _ -> ok + end, dict:update(QPid, fun(D) -> Count = case orddict:find(Key, D) of @@ -1192,3 +1198,6 @@ maybe_emit_stats(State = #ch{exchange_statistics = ExchangeStatistics, _ -> State end. + +erase_stats(QPid, State = #ch{queue_statistics = QueueStatistics}) -> + State#ch{queue_statistics = dict:erase(QPid, QueueStatistics)}. |