diff options
| author | Michael Klishin <michael@rabbitmq.com> | 2014-09-07 14:37:24 +0400 |
|---|---|---|
| committer | Michael Klishin <michael@rabbitmq.com> | 2014-09-07 14:37:24 +0400 |
| commit | 67289c8aab37015f72dab88f9404267f00d3695c (patch) | |
| tree | 19fd90272662a572bef2bd0d9b09baecf639dcc3 | |
| parent | 0b3350a51afa57d07b5bbe100408813e82710d67 (diff) | |
| download | rabbitmq-server-bug26361.tar.gz | |
Use application:get_env/2 herebug26361
| -rw-r--r-- | src/vm_memory_monitor.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl index 08c7b590..cb111583 100644 --- a/src/vm_memory_monitor.erl +++ b/src/vm_memory_monitor.erl @@ -44,6 +44,7 @@ -define(SERVER, ?MODULE). -define(DEFAULT_MEMORY_CHECK_INTERVAL, 1000). -define(ONE_MB, 1048576). +-define(APP, rabbit). %% For an unknown OS, we assume that we have 1GB of memory. It'll be %% wrong. Scale by vm_memory_high_watermark in configuration to get a @@ -112,7 +113,7 @@ get_memory_limit() -> gen_server:call(?MODULE, get_memory_limit, infinity). get_total_memory_from_configuration() -> - case application:get_env(total_memory) of + case application:get_env(?APP, total_memory) of undefined -> undefined; {ok, V} -> V end. |