diff options
| author | Michael Klishin <michael@novemberain.com> | 2015-11-20 15:56:23 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@novemberain.com> | 2015-11-20 15:56:23 +0300 |
| commit | cb220addb1af1530df6d983d619d149fe279a8d9 (patch) | |
| tree | 14b688203119d256736409df4237e883ae000790 | |
| parent | 3522f9c5310f97c12c7acc2679578ec7a088abf3 (diff) | |
| parent | 5bf4b992648c8ae583aad1d6c4fcfc1f5eb6ba3f (diff) | |
| download | rabbitmq-server-git-cb220addb1af1530df6d983d619d149fe279a8d9.tar.gz | |
Merge pull request #439 from rabbitmq/rabbitmq-server-435
Fix memory reporting for connections
| -rw-r--r-- | src/rabbit_vm.erl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/rabbit_vm.erl b/src/rabbit_vm.erl index 4146eeb447..4f160defbb 100644 --- a/src/rabbit_vm.erl +++ b/src/rabbit_vm.erl @@ -134,11 +134,10 @@ interesting_sups0() -> PluginProcs = plugin_sups(), [MsgIndexProcs, MgmtDbProcs, PluginProcs]. -%% @todo I have doubts about this ssl_connection_sup and the -%% amqp_sup. They don't seem to exist anywhere. -%% @todo We probably need to put the equivalent process here -%% (the one our Ranch supervisor is under). -conn_sups() -> [ssl_connection_sup, amqp_sup]. +conn_sups() -> + Ranches = lists:flatten(ets:match(ranch_server, {{conns_sup, '_'}, '$1'})), + [amqp_sup|Ranches]. + conn_sups(With) -> [{Sup, With} || Sup <- conn_sups()]. distinguishers() -> [{rabbit_amqqueue_sup_sup, fun queue_type/1} | |