summaryrefslogtreecommitdiff
path: root/src/gm.erl
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-04-17 14:48:41 +0100
committerSimon MacMullen <simon@rabbitmq.com>2014-04-17 14:48:41 +0100
commit51f9459b13af014da82ab742302d6c3d798e298e (patch)
tree67cb185f22fa75f4e4f7fafea265176ddea91b15 /src/gm.erl
parent26bbb663df965453592a377f1854d11d4f31a40b (diff)
parent139c2ea6b09472cddc0c48e716989cc3f204f362 (diff)
downloadrabbitmq-server-git-51f9459b13af014da82ab742302d6c3d798e298e.tar.gz
Merge bug26117
Diffstat (limited to 'src/gm.erl')
-rw-r--r--src/gm.erl12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/gm.erl b/src/gm.erl
index 2ed2fcf17c..9a51bfc28f 100644
--- a/src/gm.erl
+++ b/src/gm.erl
@@ -476,8 +476,8 @@
%% joined/2 before receiving any messages from it; and (2) we will not
%% 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()], Live :: [pid()]) ->
+-callback members_changed(Args :: term(),
+ Births :: [pid()], Deaths :: [pid()]) ->
ok | {stop, Reason :: term()} | {become, Module :: atom(), Args :: any()}.
%% Supplied with Args provided in start_link, the sender, and the
@@ -496,7 +496,7 @@
-else.
behaviour_info(callbacks) ->
- [{joined, 2}, {members_changed, 4}, {handle_msg, 3}, {terminate, 2}];
+ [{joined, 2}, {members_changed, 3}, {handle_msg, 3}, {terminate, 2}];
behaviour_info(_Other) ->
undefined.
@@ -685,8 +685,7 @@ handle_cast({validate_members, OldMembers},
Deaths = OldMembers -- NewMembers,
case {Births, Deaths} of
{[], []} -> noreply(State);
- _ -> Result = Module:members_changed(
- Args, Births, Deaths, NewMembers),
+ _ -> Result = Module:members_changed(Args, Births, Deaths),
handle_callback_result({Result, State})
end;
@@ -1399,8 +1398,7 @@ callback_view_changed(Args, Module, OldView, NewView) ->
case {Births, Deaths} of
{[], []} -> ok;
_ -> Module:members_changed(
- Args, get_pids(Births), get_pids(Deaths),
- get_pids(NewMembers))
+ Args, get_pids(Births), get_pids(Deaths))
end.
handle_callback_result({Result, State}) ->