diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2015-12-30 07:04:02 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2015-12-30 07:04:02 +0300 |
| commit | 0fe073e9e062f8e825d78153ea231c8788bedfc1 (patch) | |
| tree | 3672064ae460a7cac3896bbf8e1f035764890cb0 | |
| parent | a72ec4f0905ac1f166792c23689532ad75b59777 (diff) | |
| parent | e0c8ceda910f2fc597d276868cab995bcb2fe202 (diff) | |
| download | rabbitmq-server-git-0fe073e9e062f8e825d78153ea231c8788bedfc1.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | src/rabbit_vm.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rabbit_vm.erl b/src/rabbit_vm.erl index 50b60509e2..53885a8f9b 100644 --- a/src/rabbit_vm.erl +++ b/src/rabbit_vm.erl @@ -123,7 +123,11 @@ ets_memory(OwnerNames) -> O <- [ets:info(T, owner)], lists:member(O, Owners)]). -bytes(Words) -> Words * erlang:system_info(wordsize). +bytes(Words) -> try + Words * erlang:system_info(wordsize) + catch + _:_ -> 0 + end. interesting_sups() -> [[rabbit_amqqueue_sup_sup], conn_sups() | interesting_sups0()]. |