You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/08/17 22:26:16 UTC
[1/2] rexi commit: updated refs/heads/windsor-merge to 77dd2be
Repository: couchdb-rexi
Updated Branches:
refs/heads/windsor-merge 535941d94 -> 77dd2bed7
Remove vestigal call to margaret
We'll re-add the metric when couch_stats is merged.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/commit/6ba87011
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/tree/6ba87011
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/diff/6ba87011
Branch: refs/heads/windsor-merge
Commit: 6ba870119fcf92a42b60086fe557e2aff0598037
Parents: 535941d
Author: Paul J. Davis <pa...@gmail.com>
Authored: Sun Aug 17 15:25:20 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Sun Aug 17 15:25:20 2014 -0500
----------------------------------------------------------------------
src/rexi_buffer.erl | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-rexi/blob/6ba87011/src/rexi_buffer.erl
----------------------------------------------------------------------
diff --git a/src/rexi_buffer.erl b/src/rexi_buffer.erl
index 0ba961a..2be2322 100644
--- a/src/rexi_buffer.erl
+++ b/src/rexi_buffer.erl
@@ -50,7 +50,6 @@ handle_call(get_buffered_count, _From, State) ->
{reply, State#state.count, State, 0}.
handle_cast({deliver, Dest, Msg}, #state{buffer = Q, count = C} = State) ->
- margaret_counter:increment([erlang, rexi, buffered]),
Q2 = queue:in({Dest, Msg}, Q),
case should_drop(State) of
true ->
[2/2] rexi commit: updated refs/heads/windsor-merge to 77dd2be
Posted by da...@apache.org.
The couch_log functions are all two-arity
Project: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/commit/77dd2bed
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/tree/77dd2bed
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/diff/77dd2bed
Branch: refs/heads/windsor-merge
Commit: 77dd2bed7cadcfaa686a0008361d6e057839a515
Parents: 6ba8701
Author: Paul J. Davis <pa...@gmail.com>
Authored: Sun Aug 17 15:25:53 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Sun Aug 17 15:25:53 2014 -0500
----------------------------------------------------------------------
src/rexi_server.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-rexi/blob/77dd2bed/src/rexi_server.erl
----------------------------------------------------------------------
diff --git a/src/rexi_server.erl b/src/rexi_server.erl
index 5f9976d..f71f878 100644
--- a/src/rexi_server.erl
+++ b/src/rexi_server.erl
@@ -90,7 +90,7 @@ handle_cast({kill, FromRef}, #st{clients = Clients} = St) ->
end;
handle_cast(_, St) ->
- couch_log:notice("rexi_server ignored_cast"),
+ couch_log:notice("rexi_server ignored_cast", []),
{noreply, St}.
handle_info({'DOWN', Ref, process, _, normal}, #st{workers=Workers} = St) ->