You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/08/29 21:55:34 UTC
couch commit: updated refs/heads/master to e2d32e4
Repository: couchdb-couch
Updated Branches:
refs/heads/master cb30f6ac7 -> e2d32e440
fix stats paths
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/e2d32e44
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/e2d32e44
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/e2d32e44
Branch: refs/heads/master
Commit: e2d32e440469ff551563187e1e4029193b7791fa
Parents: cb30f6a
Author: Robert Newson <rn...@apache.org>
Authored: Fri Aug 29 20:53:47 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Fri Aug 29 20:53:47 2014 +0100
----------------------------------------------------------------------
src/couch_httpd.erl | 12 ++++++------
src/couch_httpd_cors.erl | 2 +-
src/couch_httpd_db.erl | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e2d32e44/src/couch_httpd.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd.erl b/src/couch_httpd.erl
index 32950eb..58b50f5 100644
--- a/src/couch_httpd.erl
+++ b/src/couch_httpd.erl
@@ -351,7 +351,7 @@ handle_request_int(MochiReq, DefaultFun,
end,
RequestTime = round(timer:now_diff(os:timestamp(), Begin)/1000),
couch_stats:update_histogram([couchdb, request_time], RequestTime),
- couch_stats:increment_counter([httpd, requests]),
+ couch_stats:increment_counter([couchdb, httpd, requests]),
{ok, Resp}.
check_request_uri_length(Uri) ->
@@ -390,7 +390,7 @@ authenticate_request(Response, _AuthSrcs) ->
Response.
increment_method_stats(Method) ->
- couch_stats:increment_counter([httpd_request_methods, Method]).
+ couch_stats:increment_counter([couchdb, httpd_request_methods, Method]).
validate_referer(Req) ->
Host = host_for_request(Req),
@@ -614,7 +614,7 @@ log_request(#httpd{mochi_req=MochiReq,peer=Peer}=Req, Code) ->
start_response_length(#httpd{mochi_req=MochiReq}=Req, Code, Headers, Length) ->
log_request(Req, Code),
- couch_stats:increment_counter([httpd_status_codes, Code]),
+ couch_stats:increment_counter([couchdb, httpd_status_codes, Code]),
Headers1 = Headers ++ server_header() ++
couch_httpd_auth:cookie_auth_header(Req, Headers),
Headers2 = couch_httpd_cors:cors_headers(Req, Headers1),
@@ -627,7 +627,7 @@ start_response_length(#httpd{mochi_req=MochiReq}=Req, Code, Headers, Length) ->
start_response(#httpd{mochi_req=MochiReq}=Req, Code, Headers) ->
log_request(Req, Code),
- couch_stats:increment_counter([httpd_status_codes, Code]),
+ couch_stats:increment_counter([couchdb, httpd_status_codes, Code]),
CookieHeader = couch_httpd_auth:cookie_auth_header(Req, Headers),
Headers1 = Headers ++ server_header() ++ CookieHeader,
Headers2 = couch_httpd_cors:cors_headers(Req, Headers1),
@@ -661,7 +661,7 @@ http_1_0_keep_alive(Req, Headers) ->
start_chunked_response(#httpd{mochi_req=MochiReq}=Req, Code, Headers) ->
log_request(Req, Code),
- couch_stats:increment_counter([httpd_status_codes, Code]),
+ couch_stats:increment_counter([couchdb, httpd_status_codes, Code]),
Headers1 = http_1_0_keep_alive(MochiReq, Headers),
Headers2 = Headers1 ++ server_header() ++
couch_httpd_auth:cookie_auth_header(Req, Headers1),
@@ -686,7 +686,7 @@ last_chunk(Resp) ->
send_response(#httpd{mochi_req=MochiReq}=Req, Code, Headers, Body) ->
log_request(Req, Code),
- couch_stats:increment_counter([httpd_status_codes, Code]),
+ couch_stats:increment_counter([couchdb, httpd_status_codes, Code]),
Headers1 = http_1_0_keep_alive(MochiReq, Headers),
if Code >= 500 ->
?LOG_ERROR("httpd ~p error response:~n ~s", [Code, Body]);
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e2d32e44/src/couch_httpd_cors.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd_cors.erl b/src/couch_httpd_cors.erl
index 66878d0..57b4f6b 100644
--- a/src/couch_httpd_cors.erl
+++ b/src/couch_httpd_cors.erl
@@ -174,7 +174,7 @@ handle_preflight_request(Origin, Host, MochiReq) ->
send_preflight_response(#httpd{mochi_req=MochiReq}=Req, Headers) ->
couch_httpd:log_request(Req, 204),
- couch_stats:increment_counter([httpd_status_codes, 204]),
+ couch_stats:increment_counter([couchdb, httpd_status_codes, 204]),
Headers1 = couch_httpd:http_1_0_keep_alive(MochiReq, Headers),
Headers2 = Headers1 ++ couch_httpd:server_header() ++
couch_httpd_auth:cookie_auth_header(Req, Headers1),
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e2d32e44/src/couch_httpd_db.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd_db.erl b/src/couch_httpd_db.erl
index 4fdc9aa..5dea068 100644
--- a/src/couch_httpd_db.erl
+++ b/src/couch_httpd_db.erl
@@ -145,7 +145,7 @@ handle_changes_req2(Req, Db) ->
FeedChangesFun(MakeCallback(Resp))
end
end,
- couch_stats_process_tracker:track([httpd, clients_requesting_changes]),
+ couch_stats_process_tracker:track([couchdb, httpd, clients_requesting_changes]),
WrapperFun(ChangesFun).
handle_compact_req(#httpd{method='POST'}=Req, Db) ->
@@ -285,7 +285,7 @@ db_req(#httpd{path_parts=[_,<<"_ensure_full_commit">>]}=Req, _Db) ->
send_method_not_allowed(Req, "POST");
db_req(#httpd{method='POST',path_parts=[_,<<"_bulk_docs">>]}=Req, Db) ->
- couch_stats:increment_counter([httpd, bulk_requests]),
+ couch_stats:increment_counter([couchdb, httpd, bulk_requests]),
couch_httpd:validate_ctype(Req, "application/json"),
{JsonProps} = couch_httpd:json_body_obj(Req),
case couch_util:get_value(<<"docs">>, JsonProps) of