diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-10-11 15:50:40 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-10-11 15:50:40 +0100 |
| commit | 80931756a9ec0b45ed6a75ae5ce24e2ee4de4449 (patch) | |
| tree | 4aef813c508f98226216ed2c186bb9feec236d52 /src | |
| parent | 2cb4ef50dc89da1c1574ed027d1c323f428707b1 (diff) | |
| download | rabbitmq-server-git-80931756a9ec0b45ed6a75ae5ce24e2ee4de4449.tar.gz | |
Bug 25110 broke ability to invoke "rabbitmqctl stop_app; rabbitmqctl status". Fix that.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_vm.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/rabbit_vm.erl b/src/rabbit_vm.erl index c28584c4df..53f3df18b3 100644 --- a/src/rabbit_vm.erl +++ b/src/rabbit_vm.erl @@ -100,8 +100,11 @@ child_memory(Pid, supervisor) when is_pid (Pid) -> sup_memory(Pid); child_memory(_, _) -> 0. mnesia_memory() -> - lists:sum([bytes(mnesia:table_info(Tab, memory)) || - Tab <- mnesia:system_info(tables)]). + case mnesia:system_info(is_running) of + yes -> lists:sum([bytes(mnesia:table_info(Tab, memory)) || + Tab <- mnesia:system_info(tables)]); + no -> 0 + end. ets_memory(Name) -> lists:sum([bytes(ets:info(T, memory)) || T <- ets:all(), |