More consistent naming.

6 files changed, 17 insertions, 16 deletions

diff --git a/src/gm.erl b/src/gm.erl
index 9046a11301..098d84fa30 100644
--- a/src/gm.erl
+++ b/src/gm.erl
@@ -475,7 +475,7 @@
 %% see members die that we have not seen born (or supplied in the
 %% members to joined/2).
 -callback members_changed(Args :: term(), Births :: [pid()],
-                          Deaths :: [pid()], Current :: [pid()]) ->
+                          Deaths :: [pid()], Live :: [pid()]) ->
     ok | {stop, Reason :: term()} | {become, Module :: atom(), Args :: any()}.
 
 %% Supplied with Args provided in start_link, the sender, and the
diff --git a/src/gm_soak_test.erl b/src/gm_soak_test.erl
index da98b261ab..701cb0f7ec 100644
--- a/src/gm_soak_test.erl
+++ b/src/gm_soak_test.erl
@@ -51,7 +51,7 @@ joined([], Members) ->
     put(ts, now()),
     ok.
 
-members_changed([], Births, Deaths, _Members) ->
+members_changed([], Births, Deaths, _Live) ->
     with_state(
       fun (State) ->
               State1 =
diff --git a/src/gm_speed_test.erl b/src/gm_speed_test.erl
index 146d7006c2..0f65a79214 100644
--- a/src/gm_speed_test.erl
+++ b/src/gm_speed_test.erl
@@ -30,7 +30,7 @@ joined(Owner, _Members) ->
     Owner ! joined,
     ok.
 
-members_changed(_Owner, _Births, _Deaths, _Members) ->
+members_changed(_Owner, _Births, _Deaths, _Live) ->
     ok.
 
 handle_msg(Owner, _From, ping) ->
diff --git a/src/gm_tests.erl b/src/gm_tests.erl
index 125ed53be0..9a34807691 100644
--- a/src/gm_tests.erl
+++ b/src/gm_tests.erl
@@ -40,7 +40,7 @@ joined(Pid, Members) ->
     Pid ! {joined, self(), Members},
     ok.
 
-members_changed(Pid, Births, Deaths, _Members) ->
+members_changed(Pid, Births, Deaths, _Live) ->
     Pid ! {members_changed, self(), Births, Deaths},
     ok.
 
diff --git a/src/rabbit_mirror_queue_coordinator.erl b/src/rabbit_mirror_queue_coordinator.erl
index c66cb0a412..ab466c3c47 100644
--- a/src/rabbit_mirror_queue_coordinator.erl
+++ b/src/rabbit_mirror_queue_coordinator.erl
@@ -348,10 +348,11 @@ init([#amqqueue { name = QueueName } = Q, GM, DeathFun, DepthFun]) ->
 handle_call(get_gm, _From, State = #state { gm = GM }) ->
     reply(GM, State).
 
-handle_cast({gm_deaths, Members},
+handle_cast({gm_deaths, LiveGMPids},
             State = #state { q  = #amqqueue { name = QueueName, pid = MPid } })
   when node(MPid) =:= node() ->
-    case rabbit_mirror_queue_misc:remove_from_queue(QueueName, MPid, Members) of
+    case rabbit_mirror_queue_misc:remove_from_queue(
+           QueueName, MPid, LiveGMPids) of
         {ok, MPid, DeadPids} ->
             rabbit_mirror_queue_misc:report_deaths(MPid, true, QueueName,
                                                    DeadPids),
@@ -400,10 +401,10 @@ joined([CPid], Members) ->
     CPid ! {joined, self(), Members},
     ok.
 
-members_changed([_CPid], _Births, [], _Members) ->
+members_changed([_CPid], _Births, [], _Live) ->
     ok;
-members_changed([CPid], _Births, _Deaths, Members) ->
-    ok = gen_server2:cast(CPid, {gm_deaths, Members}).
+members_changed([CPid], _Births, _Deaths, Live) ->
+    ok = gen_server2:cast(CPid, {gm_deaths, Live}).
 
 handle_msg([CPid], _From, request_depth = Msg) ->
     ok = gen_server2:cast(CPid, Msg);
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl
index b01ca7b865..538f5a44dd 100644
--- a/src/rabbit_mirror_queue_slave.erl
+++ b/src/rabbit_mirror_queue_slave.erl
@@ -172,10 +172,10 @@ handle_call({deliver, Delivery, true}, From, State) ->
     gen_server2:reply(From, ok),
     noreply(maybe_enqueue_message(Delivery, State));
 
-handle_call({gm_deaths, Members}, From,
+handle_call({gm_deaths, LiveGMPids}, From,
             State = #state { q = Q = #amqqueue { name = QName, pid = MPid }}) ->
     Self = self(),
-    case rabbit_mirror_queue_misc:remove_from_queue(QName, Self, Members) of
+    case rabbit_mirror_queue_misc:remove_from_queue(QName, Self, LiveGMPids) of
         {error, not_found} ->
             gen_server2:reply(From, ok),
             {stop, normal, State};
@@ -355,10 +355,10 @@ format_message_queue(Opt, MQ) -> rabbit_misc:format_message_queue(Opt, MQ).
 
 joined([SPid], _Members) -> SPid ! {joined, self()}, ok.
 
-members_changed([_SPid], _Births, [], _Members) ->
+members_changed([_SPid], _Births, [], _Live) ->
     ok;
-members_changed([ SPid], _Births, _Deaths, Members) ->
-    inform_deaths(SPid, Members).
+members_changed([ SPid], _Births, _Deaths, Live) ->
+    inform_deaths(SPid, Live).
 
 handle_msg([_SPid], _From, request_depth) ->
     %% This is only of value to the master
@@ -386,8 +386,8 @@ handle_msg([SPid], _From, {sync_start, Ref, Syncer, SPids}) ->
 handle_msg([SPid], _From, Msg) ->
     ok = gen_server2:cast(SPid, {gm, Msg}).
 
-inform_deaths(SPid, Members) ->
-    case gen_server2:call(SPid, {gm_deaths, Members}, infinity) of
+inform_deaths(SPid, Live) ->
+    case gen_server2:call(SPid, {gm_deaths, Live}, infinity) of
         ok              -> ok;
         {promote, CPid} -> {become, rabbit_mirror_queue_coordinator, [CPid]}
     end.