summaryrefslogtreecommitdiff
path: root/src/couchdb
diff options
context:
space:
mode:
authorJohn Christopher Anderson <jchris@apache.org>2009-03-06 18:20:09 +0000
committerJohn Christopher Anderson <jchris@apache.org>2009-03-06 18:20:09 +0000
commit5b9b9823e091b6e8720d3930785f59c424239daa (patch)
treef303f9ce00d2e9152a4bd5a84529d3e8672d6198 /src/couchdb
parentca79ad7b3104ba4a55006a358b3b7ff2f0c060e8 (diff)
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
Diffstat (limited to 'src/couchdb')
-rw-r--r--src/couchdb/couch_os_process.erl4
1 files changed, 3 insertions, 1 deletions
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) ->