Github user kxepal commented on a diff in the pull request:
https://github.com/apache/couchdb-chttpd/pull/95#discussion_r45225943
--- Diff: src/chttpd.erl ---
@@ -242,49 +274,47 @@ handle_request_int(MochiReq) ->
Response ->
Response
end
- catch
- throw:{http_head_abort, Resp0} ->
- {ok, Resp0};
- throw:{http_abort, Resp0, Reason0} ->
- {aborted, Resp0, Reason0};
- throw:{invalid_json, _} ->
- send_error(HttpReq, {bad_request, "invalid UTF-8 JSON"});
- exit:{mochiweb_recv_error, E} ->
- couch_log:notice(LogForClosedSocket ++ " - ~p", [E]),
- exit(normal);
- exit:{uri_too_long, _} ->
- send_error(HttpReq, request_uri_too_long);
- exit:{body_too_large, _} ->
- send_error(HttpReq, request_entity_too_large);
- throw:Error ->
- send_error(HttpReq, Error);
- error:database_does_not_exist ->
- send_error(HttpReq, database_does_not_exist);
- Tag:Error ->
- Stack = erlang:get_stacktrace(),
- % TODO improve logging and metrics collection for client
disconnects
- case {Tag, Error, Stack} of
- {exit, normal, [{mochiweb_request, send, _, _} | _]} ->
- exit(normal); % Client disconnect (R15+)
- {exit, normal, [{mochiweb_request, send, _} | _]} ->
- exit(normal); % Client disconnect (R14)
- _Else ->
- send_error(HttpReq, {Error, nil, Stack})
- end
- end,
-
- {HttpReq1, HttpResp0} = result(Result0, HttpReq),
- {ok, HttpResp1} = chttpd_plugin:after_request(HttpReq1, HttpResp0),
-
- HttpResp2 = update_stats(HttpReq1, HttpResp1),
- maybe_log(HttpReq1, HttpResp2),
+ catch Tag:Error ->
+ catch_error(HttpReq, Tag, Error)
+ end.
- case HttpResp2 of
- #httpd_resp{status = ok, response = Resp} ->
- {ok, Resp};
- #httpd_resp{status = aborted, reason = Reason} ->
- couch_log:error("Response abnormally terminated: ~p",
[Reason]),
- exit(normal)
+catch_error(_HttpReq, throw, {http_head_abort, Resp}) ->
+ {ok, Resp};
+catch_error(_HttpReq, throw, {http_abort, Resp, Reason}) ->
+ {aborted, Resp, Reason};
+catch_error(HttpReq, throw, {invalid_json, _}) ->
+ send_error(HttpReq, {bad_request, "invalid UTF-8 JSON"});
+catch_error(HttpReq, exit, {mochiweb_recv_error, E}) ->
+ #httpd{
+ mochi_req = MochiReq,
+ peer = Peer,
+ original_method = Method
+ } = HttpReq,
+ LogForClosedSocket = io_lib:format("mochiweb_recv_error for ~s - ~p
~s", [
+ Peer,
+ Method,
+ MochiReq:get(raw_path)
+ ]),
+ couch_log:notice(LogForClosedSocket ++ " - ~p", [E]),
--- End diff --
Why not to do formatting right in couch_log:notice call?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
