From 0bcc808ce4787da27bda33dff3c8e377094b7042 Mon Sep 17 00:00:00 2001 From: Brad Anderson Date: Mon, 24 May 2010 18:23:21 -0400 Subject: http admin call for join 'replace' --- src/mem3.erl | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/mem3.erl') diff --git a/src/mem3.erl b/src/mem3.erl index 7d60ecd5..a834010a 100644 --- a/src/mem3.erl +++ b/src/mem3.erl @@ -85,9 +85,10 @@ stop(Server) -> gen_server:cast(Server, stop). --spec join(join_type(), mem_node_list(), node() | nil) -> ok. -join(JoinType, Nodes, PingNode) -> - gen_server:call(?SERVER, {join, JoinType, Nodes, PingNode}). +-spec join(join_type(), mem_node_list() | {node(), options()}, node() | nil) -> + ok. +join(JoinType, Payload, PingNode) -> + gen_server:call(?SERVER, {join, JoinType, Payload, PingNode}). -spec clock() -> vector_clock(). @@ -153,8 +154,6 @@ init(Args) -> %% new node(s) joining to this node handle_call({join, JoinType, ExtNodes, PingNode}, _From, State) -> - % {ok, NewState} = handle_join(JoinType, ExtNodes, PingNode, State), - % {reply, ok, NewState}; try case handle_join(JoinType, ExtNodes, PingNode, State) of {ok, NewState} -> {reply, ok, NewState}; -- cgit v1.2.3