couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fdman...@apache.org
Subject svn commit: r1177556 - /couchdb/branches/1.2.x/src/couchdb/couch_replicator.erl
Date Fri, 30 Sep 2011 08:29:33 GMT
Author: fdmanana
Date: Fri Sep 30 08:29:33 2011
New Revision: 1177556

URL: http://svn.apache.org/viewvc?rev=1177556&view=rev
Log:
Replicator: update timeout to match the .ini config

This is a backport of revision 1177555 from trunk.

Modified:
    couchdb/branches/1.2.x/src/couchdb/couch_replicator.erl

Modified: couchdb/branches/1.2.x/src/couchdb/couch_replicator.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/1.2.x/src/couchdb/couch_replicator.erl?rev=1177556&r1=1177555&r2=1177556&view=diff
==============================================================================
--- couchdb/branches/1.2.x/src/couchdb/couch_replicator.erl (original)
+++ couchdb/branches/1.2.x/src/couchdb/couch_replicator.erl Fri Sep 30 08:29:33 2011
@@ -107,9 +107,10 @@ async_replicate(#rep{id = {BaseId, Ext},
     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