summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorFrancesco Mazzoli <francesco@rabbitmq.com>2012-06-27 17:07:21 +0100
committerFrancesco Mazzoli <francesco@rabbitmq.com>2012-06-27 17:07:21 +0100
commit6cacd4b0696e5eb6341babcefad6c31800d3e396 (patch)
treeeada785bb313b29937e59d95a7487c6f6a2b753f /src/rabbit.erl
parent22d0abdbcf0d5e5813d68f0094bef47d00413349 (diff)
downloadrabbitmq-server-git-6cacd4b0696e5eb6341babcefad6c31800d3e396.tar.gz
moved the status file handling to `rabbit_node_monitor', status from mnesia when online
I'm much happier with this configuration, with the exception of one problem: `rabbit_mnesia:cluster_status' will happily return the data from mnesia whenever mnesia is online, but that gives wrong results when the node is a RAM node and it just got online. I have some ideas to improve this.
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 0d2e27b931..7bdde56954 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -176,7 +176,7 @@
-rabbit_boot_step({notify_cluster,
[{description, "notify cluster nodes"},
- {mfa, {rabbit_node_monitor, notify_cluster, []}},
+ {mfa, {rabbit_node_monitor, notify_node_up, []}},
{requires, networking}]}).
%%---------------------------------------------------------------------------
@@ -332,7 +332,8 @@ start_it(StartFun) ->
stop() ->
rabbit_log:info("Stopping Rabbit~n"),
- ok = app_utils:stop_applications(app_shutdown_order()).
+ ok = app_utils:stop_applications(app_shutdown_order()),
+ rabbit_node_monitor:this_node_down().
stop_and_halt() ->
try