diff options
| author | Essien Ita Essien <essiene@gmail.com> | 2008-12-26 10:29:00 +0100 |
|---|---|---|
| committer | Essien Ita Essien <essiene@gmail.com> | 2008-12-26 10:29:00 +0100 |
| commit | a625e7695d9af4083a137821e52bd3afa09c85c2 (patch) | |
| tree | 11f0aaae33fa1335f1b986f76757b6733d64fe91 /src/rabbit.erl | |
| parent | 9e4fdee06474001eecfd58cce1ceea7e49fde9b3 (diff) | |
| parent | 4be2257979970f5b697d1e4402ca0bd6bd3ae691 (diff) | |
| download | rabbitmq-server-git-a625e7695d9af4083a137821e52bd3afa09c85c2.tar.gz | |
Merge in upstream changes
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 63ececb73e..6891fe736f 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -163,11 +163,8 @@ start(normal, []) -> ok = rabbit_amqqueue:start(), - ok = rabbit_alarm:start( - case application:get_env(start_memsup) of - {ok, Val} -> Val; - undefined -> true - end), + {ok, MemoryAlarms} = application:get_env(memory_alarms), + ok = rabbit_alarm:start(MemoryAlarms), ok = rabbit_binary_generator: check_empty_content_body_frame_size(), |