From 8374d76a0bc311c4bc17b1ec63bc84b5fb57cea8 Mon Sep 17 00:00:00 2001
From: Simon MacMullen <simon@rabbitmq.com>
Date: Thu, 14 Jun 2012 15:26:18 +0100
Subject: This has little to do with recovery - move to networking boot.

---
 src/rabbit.erl            | 1 -
 src/rabbit_networking.erl | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/rabbit.erl b/src/rabbit.erl
index c53db720..fda489fe 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -537,7 +537,6 @@ boot_delegate() ->
     rabbit_sup:start_supervisor_child(delegate_sup, [Count]).
 
 recover() ->
-    rabbit_networking:on_node_down(node()),
     rabbit_binding:recover(rabbit_exchange:recover(), rabbit_amqqueue:start()).
 
 maybe_insert_default_data() ->
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
index 94a5a2b7..89ec7084 100644
--- a/src/rabbit_networking.erl
+++ b/src/rabbit_networking.erl
@@ -117,6 +117,9 @@
 %%----------------------------------------------------------------------------
 
 boot() ->
+    %% Clear out remnants of old incarnation, in case we restarted
+    %% faster than other nodes handled DOWN messages from us.
+    on_node_down(node()),
     ok = start(),
     ok = boot_tcp(),
     ok = boot_ssl().
-- 
cgit v1.2.1