diff options
author | Brad Anderson <brad@cloudant.com> | 2010-04-23 23:20:43 -0400 |
---|---|---|
committer | Brad Anderson <brad@cloudant.com> | 2010-05-09 22:56:24 -0400 |
commit | f37f2fb12a65fc5ca5ab7bcc6e9f5272e0570fc9 (patch) | |
tree | 2d5a0df4efa26bacd927482ef2bd9e2fc1646ba4 /src | |
parent | db3e28aa026a0e2e22356851d7b93fec8247c159 (diff) |
dbg and doc
Diffstat (limited to 'src')
-rw-r--r-- | src/mem3.erl | 7 |
1 files changed, 4 insertions, 3 deletions
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}) |