summaryrefslogtreecommitdiff
path: root/src/couchdb/couch_query_servers.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/couchdb/couch_query_servers.erl')
-rw-r--r--src/couchdb/couch_query_servers.erl9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/couchdb/couch_query_servers.erl b/src/couchdb/couch_query_servers.erl
index 9b1324eb..e9f309a2 100644
--- a/src/couchdb/couch_query_servers.erl
+++ b/src/couchdb/couch_query_servers.erl
@@ -35,8 +35,8 @@ readline(Port, Acc) ->
case get(query_server_timeout) of
undefined ->
Timeout = list_to_integer(couch_config:get(
- {"couchdb", "view_timeout"}, "5000")),
- put(timeout, Timeout);
+ "couchdb", "view_timeout", "5000")),
+ put(query_server_timeout, Timeout);
Timeout -> ok
end,
receive
@@ -183,12 +183,11 @@ init([]) ->
% will restart us and then we will pick up the new settings.
ok = couch_config:register(
- fun({"query_servers" ++ _, _}) ->
+ fun("query_servers" ++ _, _) ->
?MODULE:stop()
end),
- QueryServers = couch_config:lookup_match(
- {{"query_servers", '$1'}, '$2'}, []),
+ QueryServers = couch_config:get("query_servers"),
QueryServers2 =
[{list_to_binary(Lang), Path} || {Lang, Path} <- QueryServers],