diff options
| author | Damien F. Katz <damien@apache.org> | 2008-09-13 17:32:46 +0000 |
|---|---|---|
| committer | Damien F. Katz <damien@apache.org> | 2008-09-13 17:32:46 +0000 |
| commit | 58cd856811cf0e0238bcb14792711672ba687175 (patch) | |
| tree | 50565ed1daa1a0966a301458f5dcb838828af478 /src/couchdb/couch_query_servers.erl | |
| parent | 48d2d8c0e97aa39eab674aea580a569d8aedd5c7 (diff) | |
Changes and refactorings to couch_config
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@694989 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_query_servers.erl')
| -rw-r--r-- | src/couchdb/couch_query_servers.erl | 9 |
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], |