Author: jan
Date: Wed Jun 2 12:24:21 2010
New Revision: 950529
URL: http://svn.apache.org/viewvc?rev=950529&view=rev
Log:
Merge r930365 from trunk:
change couch_server calls to have infinity timeout, because it might have to wait for disk
io.
Modified:
couchdb/branches/0.11.x/src/couchdb/couch_server.erl
Modified: couchdb/branches/0.11.x/src/couchdb/couch_server.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/src/couchdb/couch_server.erl?rev=950529&r1=950528&r2=950529&view=diff
==============================================================================
--- couchdb/branches/0.11.x/src/couchdb/couch_server.erl (original)
+++ couchdb/branches/0.11.x/src/couchdb/couch_server.erl Wed Jun 2 12:24:21 2010
@@ -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
|