diff options
| -rw-r--r-- | ebin/rabbit.app | 3 | ||||
| -rw-r--r-- | src/rabbit.erl | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/ebin/rabbit.app b/ebin/rabbit.app index 0326f461b8..5c99f5166f 100644 --- a/ebin/rabbit.app +++ b/ebin/rabbit.app @@ -48,4 +48,5 @@ {extra_startup_steps, []}, {default_user, <<"guest">>}, {default_pass, <<"guest">>}, - {default_vhost, <<"/">>}]}]}. + {default_vhost, <<"/">>}, + {start_memsup, false}]}]}. diff --git a/src/rabbit.erl b/src/rabbit.erl index 6a98eb8826..9dc2219bce 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, ShouldStartMemsup} = application:get_env(start_memsup), + ok = rabbit_alarm:start(ShouldStartMemsup), ok = rabbit_binary_generator: check_empty_content_body_frame_size(), |