couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject chttpd commit: updated refs/heads/master to c25aa24
Date Thu, 18 Jun 2015 16:19:16 GMT
Repository: couchdb-chttpd
Updated Branches:
  refs/heads/master 195065434 -> c25aa241c


Move node-specific endpoints under /_node/$name


Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/c25aa241
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/c25aa241
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/c25aa241

Branch: refs/heads/master
Commit: c25aa241c65f7667b825916b1099158d58ebe5ab
Parents: 1950654
Author: Robert Newson <rnewson@apache.org>
Authored: Thu Jun 18 16:56:32 2015 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Thu Jun 18 17:18:59 2015 +0100

----------------------------------------------------------------------
 src/chttpd.erl      |  2 +-
 src/chttpd_misc.erl | 66 ++++++++++++++++++++++++++++++------------------
 2 files changed, 42 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/c25aa241/src/chttpd.erl
----------------------------------------------------------------------
diff --git a/src/chttpd.erl b/src/chttpd.erl
index 19d01ed..5bec88f 100644
--- a/src/chttpd.erl
+++ b/src/chttpd.erl
@@ -366,7 +366,7 @@ url_handler("favicon.ico") ->   fun chttpd_misc:handle_favicon_req/1;
 url_handler("_utils") ->        fun chttpd_misc:handle_utils_dir_req/1;
 url_handler("_all_dbs") ->      fun chttpd_misc:handle_all_dbs_req/1;
 url_handler("_active_tasks") -> fun chttpd_misc:handle_task_status_req/1;
-url_handler("_node_config") ->  fun chttpd_misc:handle_node_config_req/1;
+url_handler("_node") ->         fun chttpd_misc:handle_node_req/1;
 url_handler("_reload_query_servers") -> fun chttpd_misc:handle_reload_query_servers_req/1;
 url_handler("_replicate") ->    fun chttpd_misc:handle_replicate_req/1;
 url_handler("_uuids") ->        fun chttpd_misc:handle_uuids_req/1;

http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/c25aa241/src/chttpd_misc.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_misc.erl b/src/chttpd_misc.erl
index 27b9bfd..19f3a66 100644
--- a/src/chttpd_misc.erl
+++ b/src/chttpd_misc.erl
@@ -14,7 +14,7 @@
 
 -export([
     handle_all_dbs_req/1,
-    handle_node_config_req/1,
+    handle_node_req/1,
     handle_favicon_req/1,
     handle_favicon_req/2,
     handle_replicate_req/1,
@@ -225,12 +225,12 @@ handle_uuids_req(Req) ->
     couch_httpd_misc_handlers:handle_uuids_req(Req).
 
 
-% Config request handler
+% Node-specific request handler (_config and _stats)
 
 
-% GET /_config/
-% GET /_config
-handle_node_config_req(#httpd{method='GET', path_parts=[_, Node]}=Req) ->
+% 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
         true ->
@@ -238,55 +238,63 @@ handle_node_config_req(#httpd{method='GET', path_parts=[_, Node]}=Req)
->
         false ->
             dict:store(Section, [{list_to_binary(Key), list_to_binary(Value)}], Acc)
         end
-    end, dict:new(), rpc_config(Node, all, [])),
+    end, dict:new(), call_node(Node, config, all, [])),
     KVs = dict:fold(fun(Section, Values, Acc) ->
         [{list_to_binary(Section), {Values}} | Acc]
     end, [], Grouped),
     send_json(Req, 200, {KVs});
-% GET /_config/Section
-handle_node_config_req(#httpd{method='GET', path_parts=[_, Node, Section]}=Req) ->
+% 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} <- rpc_config(Node, get, [Section])],
+            || {Key, Value} <- call_node(Node, config, get, [Section])],
     send_json(Req, 200, {KVs});
-% PUT /_config/Section/Key
+% PUT /_node/$node/config/Section/Key
 % "value"
-handle_node_config_req(#httpd{method='PUT', path_parts=[_, Node, Section, Key]}=Req) ->
+handle_node_req(#httpd{method='PUT', path_parts=[_, Node, <<"_config">>, Section,
Key]}=Req) ->
     Value = chttpd:json_body(Req),
     Persist = chttpd:header_value(Req, "X-Couch-Persist") /= "false",
-    OldValue = rpc_config(Node, get, [Section, Key, ""]),
-    ok = rpc_config(Node, set, [Section, Key, ?b2l(Value), Persist]),
+    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 /_config/Section/Key
-handle_node_config_req(#httpd{method='GET', path_parts=[_, Node, Section, Key]}=Req) ->
-    case rpc_config(Node, get, [Section, Key, undefined]) of
+% 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 ->
         throw({not_found, unknown_config_value});
     Value ->
         send_json(Req, 200, list_to_binary(Value))
     end;
-% DELETE /_config/Section/Key
-handle_node_config_req(#httpd{method='DELETE',path_parts=[_, Node, Section, Key]}=Req) ->
+% 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 rpc_config(Node, get, [Section, Key, undefined]) of
+    case call_node(Node, config, get, [Section, Key, undefined]) of
     undefined ->
         throw({not_found, unknown_config_value});
     OldValue ->
-        rpc_config(Node, delete, [Section, Key, Persist]),
+        call_node(Node, config, delete, [Section, Key, Persist]),
         send_json(Req, 200, list_to_binary(OldValue))
     end;
-handle_node_config_req(Req) ->
+handle_node_req(#httpd{path_parts=[_, Node, <<"_stats">> | Path]}=Req) ->
+    flush(Node, Req),
+    Stats0 = call_node(Node, couch_stats, fetch, []),
+    Stats = couch_stats_httpd:transform_stats(Stats0),
+    Nested = couch_stats_httpd:nest(Stats),
+    EJSON0 = couch_stats_httpd:to_ejson(Nested),
+    EJSON1 = couch_stats_httpd:extract_path(Path, EJSON0),
+    chttpd:send_json(Req, EJSON1);
+handle_node_req(Req) ->
     send_method_not_allowed(Req, "GET,PUT,DELETE").
 
-rpc_config(Node0, Fun, Args) when is_binary(Node0) ->
+call_node(Node0, Mod, Fun, Args) when is_binary(Node0) ->
     Node1 = try
                 list_to_existing_atom(?b2l(Node0))
             catch
                 error:badarg ->
                     throw({not_found, <<"no such node: ", Node0/binary>>})
             end,
-    rpc_config(Node1, Fun, Args);
-rpc_config(Node, Fun, Args) when is_atom(Node) ->
-    case rpc:call(Node, config, Fun,Args) of
+    call_node(Node1, Mod, Fun, Args);
+call_node(Node, Mod, Fun, Args) when is_atom(Node) ->
+    case rpc:call(Node, Mod, Fun, Args) of
         {badrpc, nodedown} ->
             Reason = ?l2b(io_lib:format("~s is down", [Node])),
             throw({error, {nodedown, Reason}});
@@ -294,6 +302,14 @@ rpc_config(Node, Fun, Args) when is_atom(Node) ->
             Else
     end.
 
+flush(Node, Req) ->
+    case couch_util:get_value("flush", couch_httpd:qs(Req)) of
+        "true" ->
+            call_node(Node, couch_stats_aggregator, flush, []);
+        _Else ->
+            ok
+    end.
+
 % Note: this resource is exposed on the backdoor interface, but it's in chttpd
 % because it's not couch trunk
 handle_system_req(Req) ->


Mime
View raw message