couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [31/49] chttpd commit: updated refs/heads/windsor-merge to 554ef74
Date Fri, 01 Aug 2014 09:06:07 GMT
Don't return stacktraces, log them instead.

BugzID: 17674


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

Branch: refs/heads/windsor-merge
Commit: 63378dfeeefa17621bb0fbb4f8f094029195c380
Parents: 1cc0ae3
Author: Robert Newson <robert.newson@cloudant.com>
Authored: Thu Nov 7 19:36:33 2013 +0000
Committer: Robert Newson <rnewson@apache.org>
Committed: Thu Jul 31 11:53:33 2014 +0100

----------------------------------------------------------------------
 src/chttpd.erl | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/63378dfe/src/chttpd.erl
----------------------------------------------------------------------
diff --git a/src/chttpd.erl b/src/chttpd.erl
index 7489d3a..0c9d0e0 100644
--- a/src/chttpd.erl
+++ b/src/chttpd.erl
@@ -234,8 +234,6 @@ handle_request(MochiReq) ->
                 {exit, normal, [{mochiweb_request, send, _} | _]} ->
                     exit(normal); % Client disconnect (R14)
                 _Else ->
-                    JsonStack = json_stack({Error, nil, Stack}),
-                    couch_log:error("req_err ~p:~p ~p", [Tag, Error, JsonStack]),
                     send_error(HttpReq, {Error, nil, Stack})
             end
     end,
@@ -643,6 +641,7 @@ send_delayed_error(#delayed_resp{req=Req,resp=nil}, Reason) ->
     {Code, ErrorStr, ReasonStr} = error_info(Reason),
     send_error(Req, Code, ErrorStr, ReasonStr);
 send_delayed_error(#delayed_resp{resp=Resp}, Reason) ->
+    log_stack_trace(json_stack(Reason)),
     throw({http_abort, Resp, Reason}).
 
 end_delayed_json_response(#delayed_resp{}=DelayedResp) ->
@@ -808,11 +807,16 @@ send_error(Req, Error) ->
 send_error(Req, Code, ErrorStr, ReasonStr) ->
     send_error(Req, Code, [], ErrorStr, ReasonStr, []).
 
-send_error(Req, Code, Headers, ErrorStr, ReasonStr, Stack) ->
+send_error(Req, Code, Headers, ErrorStr, ReasonStr, []) ->
     send_json(Req, Code, Headers,
         {[{<<"error">>,  ErrorStr},
-        {<<"reason">>, ReasonStr} |
-        case Stack of [] -> []; _ -> [{stack, Stack}] end
+        {<<"reason">>, ReasonStr}]});
+send_error(Req, Code, Headers, ErrorStr, ReasonStr, Stack) ->
+    log_stack_trace(Stack),
+    send_json(Req, Code, [stack_trace_id(Stack) | Headers],
+        {[{<<"error">>,  ErrorStr},
+        {<<"reason">>, ReasonStr},
+        {<<"ref">>, stack_hash(Stack)}
     ]}).
 
 % give the option for list functions to output html or other raw errors
@@ -821,11 +825,13 @@ send_chunked_error(Resp, {_Error, {[{<<"body">>, Reason}]}})
->
     send_chunk(Resp, []);
 
 send_chunked_error(Resp, Error) ->
+    Stack = json_stack(Error),
+    log_stack_trace(Stack),
     {Code, ErrorStr, ReasonStr} = error_info(Error),
     JsonError = {[{<<"code">>, Code},
         {<<"error">>,  ErrorStr},
-        {<<"reason">>, ReasonStr} |
-        case json_stack(Error) of [] -> []; Stack -> [{stack, Stack}] end
+        {<<"reason">>, ReasonStr},
+        {<<"ref">>, stack_hash(Stack)}
     ]},
     send_chunk(Resp, ?l2b([$\n,?JSON_ENCODE(JsonError),$\n])),
     send_chunk(Resp, []).
@@ -882,3 +888,12 @@ maybe_decompress(Httpd, Body) ->
     Else ->
         throw({bad_ctype, [Else, " is not a supported content encoding."]})
     end.
+
+log_stack_trace(Stack) ->
+    couch_log:error("~p failed with trace: ~p", [stack_hash(Stack), Stack]).
+
+stack_trace_id(Stack) ->
+    {"X-Cloudant-Stack-Hash", stack_hash(Stack)}.
+
+stack_hash(Stack) ->
+    erlang:crc32(term_to_binary(Stack)).


Mime
View raw message