summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-10-29 17:36:07 +0000
committerSimon MacMullen <simon@rabbitmq.com>2012-10-29 17:36:07 +0000
commitf389dbe03d78bde9dbb5cfe2b9450d907edd7cf6 (patch)
tree5999cf8316692f243f6292cf87a3114a2094fa06 /src/rabbit.erl
parentf774e7ba2fd8e478ddacc11729175f64344a71cf (diff)
parent0609c5bfa368cae3724feac2da26b9436e6e5d36 (diff)
downloadrabbitmq-server-git-f389dbe03d78bde9dbb5cfe2b9450d907edd7cf6.tar.gz
Merge default
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index ae73ebc805..c52c296ad3 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -36,7 +36,7 @@
-rabbit_boot_step({codec_correctness_check,
[{description, "codec correctness check"},
{mfa, {rabbit_binary_generator,
- check_empty_content_body_frame_size,
+ check_empty_frame_size,
[]}},
{requires, pre_boot},
{enables, external_infrastructure}]}).
@@ -303,7 +303,6 @@ start() ->
ok = ensure_working_log_handlers(),
rabbit_node_monitor:prepare_cluster_status_files(),
rabbit_mnesia:check_cluster_consistency(),
- exit(bang),
ok = app_utils:start_applications(
app_startup_order(), fun handle_app_error/2),
ok = print_plugin_info(rabbit_plugins:active())