summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAyanda Dube <ayanda.dube@erlang-solutions.com>2015-12-24 09:52:37 +0000
committerAyanda Dube <ayanda.dube@erlang-solutions.com>2015-12-24 10:09:09 +0000
commitef111e2d22d8b8abbe905c0c3abb4e5846576e59 (patch)
treefd21b7c1ee5faf999522be04028fa5fed99cdbb5 /src
parent3d478460a3d9a94160e89ee82b85eb15ec5102a1 (diff)
downloadrabbitmq-server-git-ef111e2d22d8b8abbe905c0c3abb4e5846576e59.tar.gz
Adds try-catch block and returns error on exception
Fixes #328
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_vm.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rabbit_vm.erl b/src/rabbit_vm.erl
index 50b60509e2..f3eea13505 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
+ _:Reason -> {error, Reason}
+ end.
interesting_sups() ->
[[rabbit_amqqueue_sup_sup], conn_sups() | interesting_sups0()].