diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-03-10 12:16:41 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-03-10 12:16:41 +0000 |
| commit | 726c9c389695ad37a4f0b69d9ba5b5fb57775424 (patch) | |
| tree | 26b038e08d42ac205c41f2ecd8090604e8bb412b | |
| parent | b4f0b3caf242f877481ef102e54ac1469b26e97e (diff) | |
| parent | fbe07279731c29c36ce2f637eba5cb58800b7266 (diff) | |
| download | rabbitmq-server-726c9c389695ad37a4f0b69d9ba5b5fb57775424.tar.gz | |
stable to default
| -rw-r--r-- | src/rabbit_vm.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rabbit_vm.erl b/src/rabbit_vm.erl index 597f9094..18d8eb45 100644 --- a/src/rabbit_vm.erl +++ b/src/rabbit_vm.erl @@ -43,13 +43,12 @@ memory() -> {Sums, _Other} = sum_processes(lists:append(All), [memory]), - [Conns, Qs, MsgIndexProc, MgmtDbProc, AllPlugins] = + [Conns, Qs, MsgIndexProc, MgmtDbProc, Plugins] = [aggregate_memory(Names, Sums) || Names <- All], Mnesia = mnesia_memory(), MsgIndexETS = ets_memory(rabbit_msg_store_ets_index), MgmtDbETS = ets_memory(rabbit_mgmt_db), - Plugins = AllPlugins - MgmtDbProc, [{total, Total}, {processes, Processes}, @@ -60,7 +59,7 @@ memory() -> {system, System}] = erlang:memory([total, processes, ets, atom, binary, code, system]), - OtherProc = Processes - Conns - Qs - MsgIndexProc - AllPlugins, + OtherProc = Processes - Conns - Qs - MsgIndexProc - Plugins - MgmtDbProc, [{total, Total}, {connection_procs, Conns}, |