diff options
author | Jan Lehnardt <jan@apache.org> | 2008-08-30 14:27:01 +0000 |
---|---|---|
committer | Jan Lehnardt <jan@apache.org> | 2008-08-30 14:27:01 +0000 |
commit | 3751c13253370c72735fb070588fa8d99db5e81a (patch) | |
tree | 650691eddcc992946b87a1c7d4faf41fdfacc2b4 /src/couchdb/couch_query_servers.erl | |
parent | bef662fcc96e7b578aac40154e7767de30e9a1c0 (diff) |
- Rename configuration options and sections to allow for a nicer .ini file and HTTP API calls.
- Enable .ini parser to read variable assignments with spaces around the '='-sign.
- Remove inadequate comment.
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@690513 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_query_servers.erl')
-rw-r--r-- | src/couchdb/couch_query_servers.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/couchdb/couch_query_servers.erl b/src/couchdb/couch_query_servers.erl index 0160e8c7..ad207a63 100644 --- a/src/couchdb/couch_query_servers.erl +++ b/src/couchdb/couch_query_servers.erl @@ -36,7 +36,7 @@ readline(Port, Acc) -> case get(query_server_timeout) of undefined -> Timeout = list_to_integer(couch_config:get( - {"CouchDB Query Server Options", "QueryTimeout"}, "5000")), + {"couchdb", "view_timeout"}, "5000")), put(timeout, Timeout); Timeout -> ok end, @@ -178,12 +178,12 @@ init([]) -> % will restart us and then we will pick up the new settings. ok = couch_config:register( - fun({"CouchDB Query Server" ++ _, _}) -> + fun({"query_servers" ++ _, _}) -> ?MODULE:stop() end), QueryServerList = couch_config:lookup_match( - {{"CouchDB Query Servers", '$1'}, '$2'}, []), + {{"query_servers", '$1'}, '$2'}, []), {ok, {QueryServerList, []}}. |