summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@rabbitmq.com>2014-09-06 01:11:30 +0400
committerMichael Klishin <michael@rabbitmq.com>2014-09-06 01:11:30 +0400
commitfa660da69c2ffc0cfd078f863ed54a43785be27c (patch)
tree753254e679cbd5c7e8b17113a39b5ca1f90a77fb
parent11f26b8c32cc2c6f8e472c17769f1230bc428f8c (diff)
downloadrabbitmq-server-fa660da69c2ffc0cfd078f863ed54a43785be27c.tar.gz
Refactor
-rw-r--r--src/vm_memory_monitor.erl11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl
index 08c7b590..81d44741 100644
--- a/src/vm_memory_monitor.erl
+++ b/src/vm_memory_monitor.erl
@@ -82,10 +82,7 @@
get_total_memory() ->
try
- case get_total_memory_from_configuration() of
- undefined -> get_total_memory(os:type());
- N -> N
- end
+ application:get_env(rabbit, total_memory, get_total_memory(os:type()))
catch _:Error ->
rabbit_log:warning(
"Failed to get total system memory: ~n~p~n~p~n",
@@ -111,12 +108,6 @@ set_vm_memory_high_watermark(Fraction) ->
get_memory_limit() ->
gen_server:call(?MODULE, get_memory_limit, infinity).
-get_total_memory_from_configuration() ->
- case application:get_env(total_memory) of
- undefined -> undefined;
- {ok, V} -> V
- end.
-
%%----------------------------------------------------------------------------
%% gen_server callbacks
%%----------------------------------------------------------------------------