summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-09-24 13:31:22 +0100
committerSimon MacMullen <simon@rabbitmq.com>2012-09-24 13:31:22 +0100
commit6061a00dd5ae820a12ac9899f2495b07b7808eed (patch)
treefddb2af2fc47911e22c7655681572f8b09b7f876 /src
parent4f403fba9217a3c96a385ab75213f7aa3ffce576 (diff)
downloadrabbitmq-server-git-6061a00dd5ae820a12ac9899f2495b07b7808eed.tar.gz
Add in memory used by SSL and outgoing connections to the connection / channel total.
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_vm.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_vm.erl b/src/rabbit_vm.erl
index b49c0a7cb1..95ff093ec6 100644
--- a/src/rabbit_vm.erl
+++ b/src/rabbit_vm.erl
@@ -30,7 +30,8 @@
%% Like erlang:memory(), but with awareness of rabbit-y things
memory() ->
- ConnChs = sup_memory(rabbit_tcp_client_sup),
+ ConnChs = sup_memory(rabbit_tcp_client_sup) +
+ sup_memory(ssl_connection_sup) + sup_memory(amqp_sup),
Qs = sup_memory(rabbit_amqqueue_sup) +
sup_memory(rabbit_mirror_queue_slave_sup),
Mnesia = mnesia_memory(),