summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorRob Harrop <rob@rabbitmq.com>2011-02-09 10:30:09 +0000
committerRob Harrop <rob@rabbitmq.com>2011-02-09 10:30:09 +0000
commit3259110d99fab149cd1d29b52e5ed5c644fe2ef2 (patch)
tree9568963591cf7e46fdbbcb9d0a02dfa2c09f187a /src/rabbit.erl
parent31e0664c802a7a19a70ef310f6738c0e1ce21e76 (diff)
parent0aa1f7e5b8c6eafca9ed19acf9b729403066625a (diff)
downloadrabbitmq-server-git-3259110d99fab149cd1d29b52e5ed5c644fe2ef2.tar.gz
Merge with 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