From commits-return-1950-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org Fri Mar 06 18:20:33 2009 Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 98550 invoked from network); 6 Mar 2009 18:20:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Mar 2009 18:20:33 -0000 Received: (qmail 64785 invoked by uid 500); 6 Mar 2009 18:20:32 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 64764 invoked by uid 500); 6 Mar 2009 18:20:32 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 64755 invoked by uid 99); 6 Mar 2009 18:20:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Mar 2009 10:20:32 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Mar 2009 18:20:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7287423889CF; Fri, 6 Mar 2009 18:20:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r751020 - in /couchdb/trunk: etc/couchdb/default.ini.tpl.in src/couchdb/couch_os_process.erl Date: Fri, 06 Mar 2009 18:20:10 -0000 To: commits@couchdb.apache.org From: jchris@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090306182010.7287423889CF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jchris Date: Fri Mar 6 18:20:09 2009 New Revision: 751020 URL: http://svn.apache.org/viewvc?rev=751020&view=rev Log: configure view and external server timeout in using ini variables. closes COUCHDB-246 Modified: couchdb/trunk/etc/couchdb/default.ini.tpl.in couchdb/trunk/src/couchdb/couch_os_process.erl Modified: couchdb/trunk/etc/couchdb/default.ini.tpl.in URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/default.ini.tpl.in?rev=751020&r1=751019&r2=751020&view=diff ============================================================================== --- couchdb/trunk/etc/couchdb/default.ini.tpl.in (original) +++ couchdb/trunk/etc/couchdb/default.ini.tpl.in Fri Mar 6 18:20:09 2009 @@ -8,7 +8,7 @@ util_driver_dir = %couchprivlibdir% max_document_size = 4294967296 ; 4 GB max_attachment_chunk_size = 4294967296 ; 4GB -view_timeout = 5000 ; 5 seconds +os_process_timeout = 5000 ; 5 seconds. for view and external servers. max_dbs_open = 100 [httpd] Modified: couchdb/trunk/src/couchdb/couch_os_process.erl URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_os_process.erl?rev=751020&r1=751019&r2=751020&view=diff ============================================================================== --- couchdb/trunk/src/couchdb/couch_os_process.erl (original) +++ couchdb/trunk/src/couchdb/couch_os_process.erl Fri Mar 6 18:20:09 2009 @@ -99,12 +99,14 @@ % gen_server API init([Command, Options, PortOptions]) -> + BaseTimeOut = list_to_integer(couch_config:get( + "couchdb", "os_process_timeout", "5000")), BaseProc = #os_proc{ command=Command, port=open_port({spawn, Command}, PortOptions), writer=fun writejson/2, reader=fun readjson/1, - timeout=5000 + timeout=BaseTimeOut }, OsProc = lists:foldl(fun(Opt, Proc) ->