Use twig for logging
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/638cb959 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/638cb959 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/638cb959 Branch: refs/heads/import Commit: 638cb959accd3e77bd5cb34884f84b0a2261545f Parents: 4adad3a Author: Robert Newson <[email protected]> Authored: Tue Mar 5 16:29:05 2013 -0600 Committer: Robert Newson <[email protected]> Committed: Tue Mar 5 20:18:09 2013 -0600 ---------------------------------------------------------------------- src/chttpd.app.src | 2 +- src/chttpd.erl | 12 ++++++------ src/chttpd_db.erl | 4 ++-- src/chttpd_rewrite.erl | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/638cb959/src/chttpd.app.src ---------------------------------------------------------------------- diff --git a/src/chttpd.app.src b/src/chttpd.app.src index 6897076..893939c 100644 --- a/src/chttpd.app.src +++ b/src/chttpd.app.src @@ -2,6 +2,6 @@ {description, "HTTP interface for CouchDB cluster"}, {vsn, git}, {registered, [chttpd_sup, chttpd]}, - {applications, [kernel, stdlib, couch, fabric]}, + {applications, [kernel, stdlib, twig, couch, fabric]}, {mod, {chttpd_app,[]}} ]}. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/638cb959/src/chttpd.erl ---------------------------------------------------------------------- diff --git a/src/chttpd.erl b/src/chttpd.erl index 7d006ae..c9d07ab 100644 --- a/src/chttpd.erl +++ b/src/chttpd.erl @@ -178,7 +178,7 @@ handle_request(MochiReq) -> MethodOverride = MochiReq:get_primary_header_value("X-HTTP-Method-Override"), Method2 = case lists:member(MethodOverride, ["GET", "HEAD", "POST", "PUT", "DELETE", "TRACE", "CONNECT", "COPY"]) of true -> - ?LOG_INFO("MethodOverride: ~s (real method was ~s)", [MethodOverride, Method1]), + twig:log(notice, "MethodOverride: ~s (real method was ~s)", [MethodOverride, Method1]), case Method1 of 'POST' -> couch_util:to_existing_atom(MethodOverride); _ -> @@ -225,7 +225,7 @@ handle_request(MochiReq) -> throw:{invalid_json, _} -> send_error(HttpReq, {bad_request, "invalid UTF-8 JSON"}); exit:{mochiweb_recv_error, E} -> - ?LOG_INFO(LogForClosedSocket ++ " - ~p", [E]), + twig:log(notice, LogForClosedSocket ++ " - ~p", [E]), exit(normal); throw:Error -> send_error(HttpReq, Error); @@ -233,7 +233,7 @@ handle_request(MochiReq) -> send_error(HttpReq, database_does_not_exist); Tag:Error -> Stack = erlang:get_stacktrace(), - ?LOG_ERROR("~p ~p ~p ~p", [?MODULE, Tag, Error, + twig:log(error, "~p ~p ~p ~p", [?MODULE, Tag, Error, json_stack(Error, nill, Stack)]), send_error(HttpReq, {Error, nil, Stack}) end, @@ -248,7 +248,7 @@ handle_request(MochiReq) -> {aborted, Resp:get(code)} end, Host = MochiReq:get_header_value("Host"), - ?LOG_INFO("~s ~s ~s ~s ~B ~p ~B", [Peer, Host, + twig:log(notice, "~s ~s ~s ~s ~B ~p ~B", [Peer, Host, atom_to_list(Method1), RawUri, Code, Status, round(RequestTime)]), couch_stats_collector:record({couchdb, request_time}, RequestTime), case Result of @@ -257,7 +257,7 @@ handle_request(MochiReq) -> {ok, Resp}; {aborted, _, Reason} -> couch_stats_collector:increment({httpd, aborted_requests}), - ?LOG_ERROR("Response abnormally terminated: ~p", [Reason]), + twig:log(error, "Response abnormally terminated: ~p", [Reason]), exit(normal) end. @@ -548,7 +548,7 @@ send_chunk(Resp, Data) -> send_response(#httpd{mochi_req=MochiReq}=Req, Code, Headers, Body) -> couch_stats_collector:increment({httpd_status_codes, Code}), if Code >= 400 -> - ?LOG_DEBUG("httpd ~p error response:~n ~s", [Code, Body]); + twig:log(debug, "httpd ~p error response:~n ~s", [Code, Body]); true -> ok end, {ok, MochiReq:respond({Code, Headers ++ server_header() ++ http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/638cb959/src/chttpd_db.erl ---------------------------------------------------------------------- diff --git a/src/chttpd_db.erl b/src/chttpd_db.erl index 35c3d60..97b0d4d 100644 --- a/src/chttpd_db.erl +++ b/src/chttpd_db.erl @@ -233,7 +233,7 @@ db_req(#httpd{method='POST', path_parts=[DbName], user_ctx=Ctx}=Req, Db) -> {ok, _} -> ok; {accepted, _} -> ok; Error -> - ?LOG_INFO("Batch doc error (~s): ~p",[DocId, Error]) + twig:log(notice, "Batch doc error (~s): ~p",[DocId, Error]) end end), @@ -641,7 +641,7 @@ db_doc_req(#httpd{method='PUT', user_ctx=Ctx}=Req, Db, DocId) -> {ok, _} -> ok; {accepted, _} -> ok; Error -> - ?LOG_INFO("Batch doc error (~s): ~p",[DocId, Error]) + twig:log(notice, "Batch doc error (~s): ~p",[DocId, Error]) end end), send_json(Req, 202, [], {[ http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/638cb959/src/chttpd_rewrite.erl ---------------------------------------------------------------------- diff --git a/src/chttpd_rewrite.erl b/src/chttpd_rewrite.erl index 0d99f6f..a878d09 100644 --- a/src/chttpd_rewrite.erl +++ b/src/chttpd_rewrite.erl @@ -165,7 +165,7 @@ handle_rewrite_req(#httpd{ % normalize final path (fix levels "." and "..") RawPath1 = ?b2l(iolist_to_binary(normalize_path(RawPath))), - ?LOG_DEBUG("rewrite to ~p ~n", [RawPath1]), + twig:log(debug, "rewrite to ~p ~n", [RawPath1]), % build a new mochiweb request MochiReq1 = mochiweb_request:new(MochiReq:get(socket), @@ -415,7 +415,7 @@ path_to_list([<<"..">>|R], Acc, DotDotCount) when DotDotCount == 2 -> "false" -> path_to_list(R, [<<"..">>|Acc], DotDotCount+1); _Else -> - ?LOG_INFO("insecure_rewrite_rule ~p blocked", [lists:reverse(Acc) ++ [<<"..">>] ++ R]), + twig:log(notice, "insecure_rewrite_rule ~p blocked", [lists:reverse(Acc) ++ [<<"..">>] ++ R]), throw({insecure_rewrite_rule, "too many ../.. segments"}) end; path_to_list([<<"..">>|R], Acc, DotDotCount) ->
