From f37f2fb12a65fc5ca5ab7bcc6e9f5272e0570fc9 Mon Sep 17 00:00:00 2001 From: Brad Anderson Date: Fri, 23 Apr 2010 23:20:43 -0400 Subject: dbg and doc --- src/mem3.erl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/mem3.erl b/src/mem3.erl index 007e1926..211fdf08 100644 --- a/src/mem3.erl +++ b/src/mem3.erl @@ -225,13 +225,13 @@ handle_cast(Msg, State) -> %% @doc handle nodedown messages because we have %% net_kernel:monitor_nodes(true) handle_info({nodedown, Node}, State) -> - showroom_log:message(alert, "membership: nodedown from ~p", [Node]), + showroom_log:message(alert, "membership: nodedown ~p", [Node]), {noreply, State}; %% @doc handle nodeup messages because we have %% net_kernel:monitor_nodes(true) handle_info({nodeup, Node}, State) -> - showroom_log:message(alert, "membership: nodeup Node: ~p", [Node]), + showroom_log:message(alert, "membership: nodeup ~p", [Node]), {noreply, State}; %% ignored info @@ -319,6 +319,8 @@ int_join(JoinType, ExtNodes, #mem{node=Node, nodes=Nodes, clock=Clock} = State, new_state(NewState, Pmap, Fullmap, Config). +%% @doc handle the gossip messages +%% We're not using vector_clock:resolve b/c we need custom merge strategy handle_gossip(RemoteState=#mem{clock=RemoteClock}, LocalState=#mem{clock=LocalClock}) -> case vector_clock:compare(RemoteClock, LocalClock) of @@ -358,7 +360,6 @@ merge_nodes(Remote, Local) -> end. - % notify(Type, Nodes) -> % lists:foreach(fun(Node) -> % gen_event:notify(membership_events, {Type, Node}) -- cgit v1.2.3