Backed out changeset 829aa0bb9657

Error handling is not equivalent in the inlined version.

1 files changed, 10 insertions, 1 deletions

diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl
index 81d44741..08c7b590 100644
--- a/src/vm_memory_monitor.erl
+++ b/src/vm_memory_monitor.erl
@@ -82,7 +82,10 @@
 
 get_total_memory() ->
     try
-        application:get_env(rabbit, total_memory, get_total_memory(os:type()))
+        case get_total_memory_from_configuration() of
+            undefined -> get_total_memory(os:type());
+            N         -> N
+        end
     catch _:Error ->
             rabbit_log:warning(
               "Failed to get total system memory: ~n~p~n~p~n",
@@ -108,6 +111,12 @@ 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
 %%----------------------------------------------------------------------------