From 3d9ed7cd491a087fa63048111169d10b81576843 Mon Sep 17 00:00:00 2001
From: Simon MacMullen <simon@rabbitmq.com>
Date: Mon, 16 Sep 2013 16:40:11 +0100
Subject: Cosmetic to be closer to what's on default.

---
 src/rabbit_mirror_queue_slave.erl | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl
index c92bc1f2..ec57fdc7 100644
--- a/src/rabbit_mirror_queue_slave.erl
+++ b/src/rabbit_mirror_queue_slave.erl
@@ -150,26 +150,22 @@ init_it(Self, GM, Node, QName) ->
     case mnesia:read({rabbit_queue, QName}) of
         [Q = #amqqueue { pid = QPid, slave_pids = SPids, gm_pids = GMPids }] ->
             case [Pid || Pid <- [QPid | SPids], node(Pid) =:= Node] of
-                [] ->
-                    add_slave(Q, Self, GM),
-                    {new, QPid, GMPids};
-                [QPid] ->
-                    case rabbit_misc:is_process_alive(QPid) of
-                        true  -> duplicate_live_master;
-                        false -> {stale, QPid}
-                    end;
-                [SPid] ->
-                    case rabbit_misc:is_process_alive(SPid) of
-                        true ->
-                            existing;
-                        false ->
-                            Q1 = Q#amqqueue {
-                                   slave_pids = SPids -- [SPid],
-                                   gm_pids    = [T || T = {_, S} <- GMPids,
-                                                      S =/= SPid] },
-                            add_slave(Q1, Self, GM),
-                            {new, QPid, GMPids}
-                    end
+                []     -> add_slave(Q, Self, GM),
+                          {new, QPid, GMPids};
+                [QPid] -> case rabbit_misc:is_process_alive(QPid) of
+                              true  -> duplicate_live_master;
+                              false -> {stale, QPid}
+                          end;
+                [SPid] -> case rabbit_misc:is_process_alive(SPid) of
+                              true  -> existing;
+                              false -> GMPids = [T || T = {_, S} <- GMPids,
+                                                      S =/= SPid],
+                                       Q1 = Q#amqqueue{
+                                              slave_pids = SPids -- [SPid],
+                                              gm_pids    = GMPids},
+                                       add_slave(Q1, Self, GM),
+                                       {new, QPid, GMPids}
+                          end
             end;
         [] ->
             master_in_recovery
-- 
cgit v1.2.1