summaryrefslogtreecommitdiff
path: root/src/vector_clock.erl
diff options
context:
space:
mode:
authorBrad Anderson <brad@cloudant.com>2010-04-14 23:09:38 -0400
committerBrad Anderson <brad@cloudant.com>2010-05-09 22:56:24 -0400
commit75005e7dfc78bc9232e1364799a03ad541ce0244 (patch)
tree16361a00fc6eb4d413cdbf1ad2fb510a6b9a9a8f /src/vector_clock.erl
parentf5bcba1df93803f02e6ecd20b84c5dbbe2f1b4d8 (diff)
tested gossip with two nodes and a jointype of 'first', added pinging of nodes to set up distributed erlang, and had some logging & throwing cleanup
Diffstat (limited to 'src/vector_clock.erl')
-rw-r--r--src/vector_clock.erl9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/vector_clock.erl b/src/vector_clock.erl
index 0a89d41e..740d1520 100644
--- a/src/vector_clock.erl
+++ b/src/vector_clock.erl
@@ -31,10 +31,11 @@ resolve({ClockA, ValuesA}, {ClockB, ValuesB}) ->
greater -> {ClockA, ValuesA};
equal -> {ClockA, ValuesA};
concurrent ->
- io:format("~nConcurrent Clocks~n"
- "ClockA : ~p~nClockB : ~p~n"
- "ValuesA: ~p~nValuesB: ~p~n"
- , [ClockA, ClockB, ValuesA, ValuesB]),
+ showroom_log:message(info,
+ "~nConcurrent Clocks~n"
+ "ClockA : ~p~nClockB : ~p~n"
+ "ValuesA: ~p~nValuesB: ~p~n"
+ , [ClockA, ClockB, ValuesA, ValuesB]),
{merge(ClockA,ClockB), ValuesA ++ ValuesB}
end;
resolve(not_found, {Clock, Values}) ->