summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2011-02-08 13:36:42 +0000
committerMatthew Sackman <matthew@rabbitmq.com>2011-02-08 13:36:42 +0000
commit89f1a813cf468345aa1f8f8c9dd20ab42da2567d (patch)
tree5bd137e34dedf2ff5c8b3c22615a3c63a2580606 /src/rabbit.erl
parent6f9e00562be2166c0f58ebc5f3f959cd7daf0ced (diff)
parentb1c9b049883dcf1b4a0f13e7b7f288ae8047722c (diff)
downloadrabbitmq-server-git-89f1a813cf468345aa1f8f8c9dd20ab42da2567d.tar.gz
Merging bug22698 to default
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index c6661d390a..67e2e40f47 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -153,6 +153,11 @@
[{mfa, {rabbit_networking, boot, []}},
{requires, log_relay}]}).
+-rabbit_boot_step({notify_cluster,
+ [{description, "notify cluster nodes"},
+ {mfa, {rabbit_node_monitor, notify_cluster, []}},
+ {requires, networking}]}).
+
%%---------------------------------------------------------------------------
-include("rabbit_framing.hrl").
@@ -225,11 +230,11 @@ start(normal, []) ->
case erts_version_check() of
ok ->
{ok, SupPid} = rabbit_sup:start_link(),
+ true = register(rabbit, self()),
print_banner(),
[ok = run_boot_step(Step) || Step <- boot_steps()],
io:format("~nbroker running~n"),
-
{ok, SupPid};
Error ->
Error