summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-12-19 11:40:27 +0000
committerSimon MacMullen <simon@rabbitmq.com>2013-12-19 11:40:27 +0000
commit7852f12f107522195c7c911397ff7b41134e4c29 (patch)
tree3c6bcae264cfe01b07b5fcfd3c3fb71b564391e5
parent853926fa4b462f0443b8d132ff29428da6294917 (diff)
downloadrabbitmq-server-7852f12f107522195c7c911397ff7b41134e4c29.tar.gz
Scarier warning
-rw-r--r--src/vm_memory_monitor.erl23
1 files changed, 13 insertions, 10 deletions
diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl
index 369ec655..fc4353dc 100644
--- a/src/vm_memory_monitor.erl
+++ b/src/vm_memory_monitor.erl
@@ -173,16 +173,19 @@ set_mem_limits(State, MemFraction) ->
?MEMORY_SIZE_FOR_UNKNOWN_OS;
M -> M
end,
- UsableMemory = case get_vm_limit() of
- Limit when Limit < TotalMemory ->
- error_logger:warning_msg(
- "Only ~pMB of ~pMB memory usable due to "
- "limited address space.~n",
- [trunc(V/?ONE_MB) || V <- [Limit, TotalMemory]]),
- Limit;
- _ ->
- TotalMemory
- end,
+ UsableMemory =
+ case get_vm_limit() of
+ Limit when Limit < TotalMemory ->
+ error_logger:warning_msg(
+ "Only ~pMB of ~pMB memory usable due to "
+ "limited address space.~n"
+ "Crashes due to memory exhaustion are possible - see~n"
+ "http://www.rabbitmq.com/memory.html#address-space~n",
+ [trunc(V/?ONE_MB) || V <- [Limit, TotalMemory]]),
+ Limit;
+ _ ->
+ TotalMemory
+ end,
MemLim = trunc(MemFraction * UsableMemory),
error_logger:info_msg("Memory limit set to ~pMB of ~pMB total.~n",
[trunc(MemLim/?ONE_MB), trunc(TotalMemory/?ONE_MB)]),