You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2015/06/18 18:42:06 UTC
chttpd commit: updated refs/heads/master to dc9c347
Repository: couchdb-chttpd
Updated Branches:
refs/heads/master c25aa241c -> dc9c347b9
Fix comments for /_node/$node handlers
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/dc9c347b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/dc9c347b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/dc9c347b
Branch: refs/heads/master
Commit: dc9c347b92ced5535a9952382beb858595912f7d
Parents: c25aa24
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Jun 18 19:40:04 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Jun 18 19:40:04 2015 +0300
----------------------------------------------------------------------
src/chttpd_misc.erl | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/dc9c347b/src/chttpd_misc.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_misc.erl b/src/chttpd_misc.erl
index 19f3a66..5da9b1b 100644
--- a/src/chttpd_misc.erl
+++ b/src/chttpd_misc.erl
@@ -228,8 +228,7 @@ handle_uuids_req(Req) ->
% Node-specific request handler (_config and _stats)
-% GET /_node/$node/config/
-% GET /_node/$node/config
+% GET /_node/$node/_config
handle_node_req(#httpd{method='GET', path_parts=[_, Node, <<"_config">>]}=Req) ->
Grouped = lists:foldl(fun({{Section, Key}, Value}, Acc) ->
case dict:is_key(Section, Acc) of
@@ -243,12 +242,12 @@ handle_node_req(#httpd{method='GET', path_parts=[_, Node, <<"_config">>]}=Req) -
[{list_to_binary(Section), {Values}} | Acc]
end, [], Grouped),
send_json(Req, 200, {KVs});
-% GET /_node/$node/config/Section
+% GET /_node/$node/_config/Section
handle_node_req(#httpd{method='GET', path_parts=[_, Node, <<"_config">>, Section]}=Req) ->
KVs = [{list_to_binary(Key), list_to_binary(Value)}
|| {Key, Value} <- call_node(Node, config, get, [Section])],
send_json(Req, 200, {KVs});
-% PUT /_node/$node/config/Section/Key
+% PUT /_node/$node/_config/Section/Key
% "value"
handle_node_req(#httpd{method='PUT', path_parts=[_, Node, <<"_config">>, Section, Key]}=Req) ->
Value = chttpd:json_body(Req),
@@ -256,7 +255,7 @@ handle_node_req(#httpd{method='PUT', path_parts=[_, Node, <<"_config">>, Section
OldValue = call_node(Node, config, get, [Section, Key, ""]),
ok = call_node(Node, config, set, [Section, Key, ?b2l(Value), Persist]),
send_json(Req, 200, list_to_binary(OldValue));
-% GET /_node/$node/config/Section/Key
+% GET /_node/$node/_config/Section/Key
handle_node_req(#httpd{method='GET', path_parts=[_, Node, <<"_config">>, Section, Key]}=Req) ->
case call_node(Node, config, get, [Section, Key, undefined]) of
undefined ->
@@ -264,7 +263,7 @@ handle_node_req(#httpd{method='GET', path_parts=[_, Node, <<"_config">>, Section
Value ->
send_json(Req, 200, list_to_binary(Value))
end;
-% DELETE /_node/$node/config/Section/Key
+% DELETE /_node/$node/_config/Section/Key
handle_node_req(#httpd{method='DELETE',path_parts=[_, Node, <<"_config">>, Section, Key]}=Req) ->
Persist = chttpd:header_value(Req, "X-Couch-Persist") /= "false",
case call_node(Node, config, get, [Section, Key, undefined]) of
@@ -274,6 +273,7 @@ handle_node_req(#httpd{method='DELETE',path_parts=[_, Node, <<"_config">>, Secti
call_node(Node, config, delete, [Section, Key, Persist]),
send_json(Req, 200, list_to_binary(OldValue))
end;
+% GET /_node/$node/_stats
handle_node_req(#httpd{path_parts=[_, Node, <<"_stats">> | Path]}=Req) ->
flush(Node, Req),
Stats0 = call_node(Node, couch_stats, fetch, []),