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/11 22:03:48 UTC
[1/2] couch-replicator commit: updated refs/heads/windsor-merge to
9b2dd48
Repository: couchdb-couch-replicator
Updated Branches:
refs/heads/windsor-merge a85ab8168 -> 9b2dd4823
start_link functions should return {ok, Pid}
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/087bef99
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/087bef99
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/087bef99
Branch: refs/heads/windsor-merge
Commit: 087bef992c4a296b0e7fa3aff2c7bb63fedd8505
Parents: a85ab81
Author: Paul J. Davis <pa...@gmail.com>
Authored: Mon Aug 11 15:03:06 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Mon Aug 11 15:03:06 2014 -0500
----------------------------------------------------------------------
src/couch_replicator_changes_reader.erl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/087bef99/src/couch_replicator_changes_reader.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator_changes_reader.erl b/src/couch_replicator_changes_reader.erl
index f28dd51..623e8f9 100644
--- a/src/couch_replicator_changes_reader.erl
+++ b/src/couch_replicator_changes_reader.erl
@@ -28,17 +28,17 @@
start_link(StartSeq, #httpdb{} = Db, ChangesQueue, Options) ->
Parent = self(),
- spawn_link(fun() ->
+ {ok, spawn_link(fun() ->
put(last_seq, StartSeq),
put(retries_left, Db#httpdb.retries),
?MODULE:read_changes(Parent, StartSeq, Db#httpdb{retries = 0},
ChangesQueue, Options, 1)
- end);
+ end)};
start_link(StartSeq, Db, ChangesQueue, Options) ->
Parent = self(),
- spawn_link(fun() ->
+ {ok, spawn_link(fun() ->
?MODULE:read_changes(Parent, StartSeq, Db, ChangesQueue, Options, 1)
- end).
+ end)}.
read_changes(Parent, StartSeq, Db, ChangesQueue, Options, Ts) ->
Continuous = couch_util:get_value(continuous, Options),
[2/2] couch-replicator commit: updated refs/heads/windsor-merge to
9b2dd48
Posted by da...@apache.org.
Add the mod entry so the application starts correctly.
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/9b2dd482
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/9b2dd482
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/9b2dd482
Branch: refs/heads/windsor-merge
Commit: 9b2dd48231417c2b84dae746f8bf81accf09bb12
Parents: 087bef9
Author: Paul J. Davis <pa...@gmail.com>
Authored: Mon Aug 11 15:03:37 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Mon Aug 11 15:03:37 2014 -0500
----------------------------------------------------------------------
src/couch_replicator.app.src | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/9b2dd482/src/couch_replicator.app.src
----------------------------------------------------------------------
diff --git a/src/couch_replicator.app.src b/src/couch_replicator.app.src
index 06c6c68..f4470f2 100644
--- a/src/couch_replicator.app.src
+++ b/src/couch_replicator.app.src
@@ -13,6 +13,7 @@
{application, couch_replicator, [
{description, "CouchDB replicator"},
{vsn, git},
+ {mod, {couch_replicator_app, []}},
{modules, [
couch_replicator,
couch_replicator_api_wrap,