Changes and refactorings to couch_config

git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@694989 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 5 deletions

diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl
index c3630f83..04189764 100644
--- a/src/couchdb/couch_server.erl
+++ b/src/couchdb/couch_server.erl
@@ -94,13 +94,13 @@ init([]) ->
     % just stop if one of the config settings change. couch_server_sup
     % will restart us and then we will pick up the new settings.
 
-    RootDir = couch_config:get({"couchdb", "database_dir"}, "."),
-    MaxDbsOpen = couch_config:get({"couchdb", "max_open_databases"}, "100"),
+    RootDir = couch_config:get("couchdb", "database_dir", "."),
+    MaxDbsOpen = couch_config:get("couchdb", "max_open_databases", "100"),
     Self = self(),
     ok = couch_config:register(
-        fun({"couchdb", "database_dir"}) ->
+        fun("couchdb", "database_dir") ->
             exit(Self, config_change);
-        ({"couchdb", "server_options"}) ->
+        ("couchdb", "server_options") ->
             exit(Self, config_change)
         end),
     {ok, RegExp} = regexp:parse("^[a-z][a-z0-9\\_\\$()\\+\\-\\/]*$"),
@@ -264,7 +264,7 @@ handle_call({delete, DbName}, _From, Server) ->
         {reply, Error, Server}
     end;
 handle_call(remote_restart, _From, Server) ->
-    case couch_config:get({"couchdb", "allow_remote_restart"}, "false") of
+    case couch_config:get("couchdb", "allow_remote_restart", "false") of
     "true" ->
         exit(couch_server_sup, restart);
     _ ->