diff options
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 016a461a33..7a2560f0e1 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -141,10 +141,16 @@ start(normal, []) -> ok = rabbit_binary_generator: check_empty_content_body_frame_size(), - {ok, MemoryAlarms} = application:get_env(memory_alarms), - ok = rabbit_alarm:start(MemoryAlarms), - - ok = start_child(rabbit_memory_manager), + ok = rabbit_alarm:start(), + MemoryWatermark = + application:get_env(os_mon, vm_memory_high_watermark), + ok = case MemoryWatermark of + {ok, Float} when Float == 0 -> ok; + {ok, Float} -> start_child(vm_memory_monitor, [Float]); + undefined -> + throw({undefined, os_mon, + vm_memory_high_watermark, settings}) + end, ok = rabbit_amqqueue:start(), |