couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kocol...@apache.org
Subject [27/50] git commit: Replicator: update timeout to match the .ini config
Date Wed, 26 Oct 2011 18:05:33 GMT
Replicator: update timeout to match the .ini config


git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1177555 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9467ebbf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9467ebbf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9467ebbf

Branch: refs/heads/1319-large-headers-are-corrupted
Commit: 9467ebbf40be6e7773db52634a420c697257bcfe
Parents: daf264b
Author: Filipe David Borba Manana <fdmanana@apache.org>
Authored: Fri Sep 30 08:28:59 2011 +0000
Committer: Filipe David Borba Manana <fdmanana@apache.org>
Committed: Fri Sep 30 08:28:59 2011 +0000

----------------------------------------------------------------------
 src/couchdb/couch_replicator.erl |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/9467ebbf/src/couchdb/couch_replicator.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_replicator.erl b/src/couchdb/couch_replicator.erl
index 663ce27..24f87cb 100644
--- a/src/couchdb/couch_replicator.erl
+++ b/src/couchdb/couch_replicator.erl
@@ -107,9 +107,10 @@ async_replicate(#rep{id = {BaseId, Ext}, source = Src, target = Tgt}
= Rep) ->
     RepChildId = BaseId ++ Ext,
     Source = couch_api_wrap:db_uri(Src),
     Target = couch_api_wrap:db_uri(Tgt),
+    Timeout = get_value(connection_timeout, Rep#rep.options),
     ChildSpec = {
         RepChildId,
-        {gen_server, start_link, [?MODULE, Rep, [{timeout, 20000}]]},
+        {gen_server, start_link, [?MODULE, Rep, [{timeout, Timeout}]]},
         temporary,
         1,
         worker,


Mime
View raw message