You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/08/28 14:15:59 UTC
[28/37] couch-replicator commit: updated refs/heads/master to aafb5f9
squash! Fix couch_replicator_mangaer changes feed upgrades
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/commit/a85ab816
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/a85ab816
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/a85ab816
Branch: refs/heads/master
Commit: a85ab8168a2c0817b009d75b01538f188ad9bbc3
Parents: 75e5ba1
Author: Robert Newson <rn...@apache.org>
Authored: Fri Aug 8 10:27:06 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Fri Aug 8 10:27:06 2014 +0100
----------------------------------------------------------------------
src/couch_replicator_manager.erl | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/a85ab816/src/couch_replicator_manager.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator_manager.erl b/src/couch_replicator_manager.erl
index c145b75..9b1e818 100644
--- a/src/couch_replicator_manager.erl
+++ b/src/couch_replicator_manager.erl
@@ -25,7 +25,7 @@
-export([code_change/3, terminate/2]).
% changes callbacks
--export([changes_reader/3, changes_reader_cb/2]).
+-export([changes_reader/3, changes_reader_cb/3]).
% config_listener callback
-export([handle_config_change/5]).
@@ -306,9 +306,9 @@ changes_reader(Server, DbName, Since) ->
{json_req, null},
Db
),
- ChangesFeedFun({fun ?MODULE:changes_reader_cb/2, {Server, DbName}}).
+ ChangesFeedFun({fun ?MODULE:changes_reader_cb/3, {Server, DbName}}).
-changes_reader_cb({change, Change}, {Server, DbName}) ->
+changes_reader_cb({change, Change}, _, {Server, DbName}) ->
case has_valid_rep_id(Change) of
true ->
Msg = {rep_db_update, DbName, Change},
@@ -317,11 +317,11 @@ changes_reader_cb({change, Change}, {Server, DbName}) ->
ok
end,
{ok, {Server, DbName}};
-changes_reader_cb({stop, EndSeq, _Pending}, {Server, DbName}) ->
+changes_reader_cb({stop, EndSeq, _Pending}, _, {Server, DbName}) ->
Msg = {rep_db_checkpoint, DbName, EndSeq},
ok = gen_server:call(Server, Msg, infinity),
{ok, {Server, DbName}};
-changes_reader_cb(_, Acc) ->
+changes_reader_cb(_, _, Acc) ->
{ok, Acc}.
has_valid_rep_id({Change}) ->