diff options
Diffstat (limited to 'src/couchdb/couch_os_process.erl')
| -rw-r--r-- | src/couchdb/couch_os_process.erl | 4 |
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) -> |