From 5b9b9823e091b6e8720d3930785f59c424239daa Mon Sep 17 00:00:00 2001
From: John Christopher Anderson <jchris@apache.org>
Date: Fri, 6 Mar 2009 18:20:09 +0000
Subject: configure view and external server timeout in using ini variables.
 closes COUCHDB-246

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@751020 13f79535-47bb-0310-9956-ffa450edef68
---
 src/couchdb/couch_os_process.erl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/couchdb/couch_os_process.erl b/src/couchdb/couch_os_process.erl
index 63cc07b0..a6c7ef25 100644
--- a/src/couchdb/couch_os_process.erl
+++ b/src/couchdb/couch_os_process.erl
@@ -99,12 +99,14 @@ readjson(OsProc) when is_record(OsProc, os_proc) ->
 
 % 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) ->
-- 
cgit v1.2.3