summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien F. Katz <damien@apache.org>2010-04-02 20:01:17 +0000
committerDamien F. Katz <damien@apache.org>2010-04-02 20:01:17 +0000
commit776b36073865dc66a7834beabf3074b32d9669a1 (patch)
tree4e5b8051099357ffe3dfe91ae996fd0881fdc400
parente59e7bff7b4f14b6e919e72e0b88cb0ce5eec8b6 (diff)
change couch_server calls to have infinity timeout, because it might have to wait for disk io.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@930365 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/couchdb/couch_server.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl
index 28d9024a..d3394059 100644
--- a/src/couchdb/couch_server.erl
+++ b/src/couchdb/couch_server.erl
@@ -51,7 +51,7 @@ sup_start_link() ->
gen_server:start_link({local, couch_server}, couch_server, [], []).
open(DbName, Options) ->
- case gen_server:call(couch_server, {open, DbName, Options}) of
+ case gen_server:call(couch_server, {open, DbName, Options}, infinity) of
{ok, Db} ->
Ctx = proplists:get_value(user_ctx, Options, #user_ctx{}),
{ok, Db#db{user_ctx=Ctx}};
@@ -60,7 +60,7 @@ open(DbName, Options) ->
end.
create(DbName, Options) ->
- case gen_server:call(couch_server, {create, DbName, Options}) of
+ case gen_server:call(couch_server, {create, DbName, Options}, infinity) of
{ok, Db} ->
Ctx = proplists:get_value(user_ctx, Options, #user_ctx{}),
{ok, Db#db{user_ctx=Ctx}};
@@ -69,7 +69,7 @@ create(DbName, Options) ->
end.
delete(DbName, Options) ->
- gen_server:call(couch_server, {delete, DbName, Options}).
+ gen_server:call(couch_server, {delete, DbName, Options}, infinity).
check_dbname(#server{dbname_regexp=RegExp}, DbName) ->
case re:run(DbName, RegExp, [{capture, none}]) of