diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-06-14 15:26:18 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-06-14 15:26:18 +0100 |
| commit | 8374d76a0bc311c4bc17b1ec63bc84b5fb57cea8 (patch) | |
| tree | ac490a1a2870f70f026e2273db698af6a45112c2 | |
| parent | ff0fe300a6c76599d02a926c0bb3cb5db6cc9276 (diff) | |
| download | rabbitmq-server-8374d76a0bc311c4bc17b1ec63bc84b5fb57cea8.tar.gz | |
This has little to do with recovery - move to networking boot.
| -rw-r--r-- | src/rabbit.erl | 1 | ||||
| -rw-r--r-- | src/rabbit_networking.erl | 3 |
2 files changed, 3 insertions, 1 deletions
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(). |