Revert aa8a9e4d1bb2 (extra debugging for mirrored_supervisor)

1 files changed, 8 insertions, 10 deletions

diff --git a/src/mirrored_supervisor.erl b/src/mirrored_supervisor.erl
index ff2b95a0..4fe93981 100644
--- a/src/mirrored_supervisor.erl
+++ b/src/mirrored_supervisor.erl
@@ -303,7 +303,7 @@ handle_call({init, Overall}, _From,
     State1 = State#state{overall = Overall, delegate = Delegate},
     case errors([maybe_start(Group, Delegate, S) || S <- ChildSpecs]) of
         []     -> {reply, ok, State1};
-        Errors -> {stop, {shutdown, {init, Errors, ChildSpecs}}, State1}
+        Errors -> {stop, {shutdown, Errors}, State1}
     end;
 
 handle_call({start_child, ChildSpec}, _From,
@@ -361,17 +361,15 @@ handle_info({'DOWN', _Ref, process, Pid, _Reason},
     %% TODO load balance this
     %% No guarantee pg2 will have received the DOWN before us.
     Self = self(),
-    {R, Cs, X} =
-        case lists:sort(?PG2:get_members(Group)) -- [Pid] of
-            [Self | _] -> {atomic, {ChildSpecs, Extra}} =
+    R = case lists:sort(?PG2:get_members(Group)) -- [Pid] of
+            [Self | _] -> {atomic, ChildSpecs} =
                               mnesia:transaction(fun() -> update_all(Pid) end),
-                          {[start(Delegate, ChildSpec) || ChildSpec <- ChildSpecs],
-                           ChildSpecs, Extra};
-            _          -> {[], [], []}
+                          [start(Delegate, ChildSpec) || ChildSpec <- ChildSpecs];
+            _          -> []
         end,
     case errors(R) of
         []     -> {noreply, State};
-        Errors -> {stop, {shutdown, {down, Errors, Cs, X}}, State}
+        Errors -> {stop, {shutdown, Errors}, State}
     end;
 
 handle_info(Info, State) ->
@@ -455,8 +453,8 @@ update_all(OldPid) ->
                                         key           = '$1',
                                         childspec     = '$2',
                                         _             = '_'},
-    Matches = mnesia:select(?TABLE, [{MatchHead, [], ['$$']}]),
-    {[write(Group, C) || [{Group, _Id}, C] <- Matches], {OldPid, Matches}}.
+    [write(Group, C) ||
+        [{Group, _Id}, C] <- mnesia:select(?TABLE, [{MatchHead, [], ['$$']}])].
 
 delete_all(Group) ->
     MatchHead = #mirrored_sup_childspec{key       = {Group, '_'},