Skip to content

Commit

Permalink
Log 500 errors in the error log.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mworrell
mworrell committed Nov 30, 2015
1 parent da50cc7 commit 64d76a9
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 28 deletions.
9 changes: 2 additions & 7 deletions src/webmachine_controller.erl
View file
Expand Up @@ -203,13 +203,8 @@ controller_call(F, Controller, ReqData) ->
Controller#wm_controller.mod,
F,
[ReqData, Controller#wm_controller.mod_state]),
Result = try
{Res,RD1,ModState1} = apply(Controller#wm_controller.mod, F, [ReqData, Controller#wm_controller.mod_state]),
{Res, Controller#wm_controller{mod_state=ModState1}, RD1}
catch C:R ->
Reason = {C, R, erlang:get_stacktrace()},
{{error, Reason}, Controller, ReqData}
end,
{Res, RD1, ModState1} = apply(Controller#wm_controller.mod, F, [ReqData, Controller#wm_controller.mod_state]),
Result = {Res, Controller#wm_controller{mod_state=ModState1}, RD1},
log_call(Controller#wm_controller.trace,
attempt,
Controller#wm_controller.mod,
Expand Down
5 changes: 3 additions & 2 deletions src/webmachine_decision_core.erl
View file
Expand Up @@ -31,12 +31,13 @@ handle_request(Resource, ReqData) ->
d(v3b13, Resource, ReqData)
catch
error:X ->
Stacktrace = erlang:get_stacktrace(),
case application:get_env(webzmachine, error_handler) of
{ok, controller} ->
throw({stop_request, 500, erlang:get_stacktrace()});
throw({stop_request, 500, {X, Stacktrace}});
_ErrorHandler ->
?WM_DBG(X),
error_response(erlang:get_stacktrace(), Resource, ReqData)
error_response(Stacktrace, Resource, ReqData)
end
end.

Expand Down
55 changes: 36 additions & 19 deletions src/webmachine_mochiweb.erl
View file
Expand Up @@ -115,34 +115,36 @@ loop(MochiReq, LoopOpts) ->
erlang:put(mochiweb_request_force_close, true)
end
catch
throw:{stop_request, 500, Reason} ->
error_logger:error_msg("~p:~p stop_request ~p (reason ~p)", [?MODULE, ?LINE, 500, Reason]),
handle_stop_request(ErrorHandler, 500, Reason, ReqDispatch, Mod, ModOpts,
Bindings,HostTokens,Port,PathTokens,AppRoot,StringPath, ReqDispatch);
throw:{stop_request, ResponseCode, Reason}
when ErrorHandler =:= controller, is_integer(ResponseCode), ResponseCode >= 400, ResponseCode =< 500 ->
{ok, ErrResource} = webmachine_controller:init(ReqDispatch, controller_http_error, ModOpts),
{ok, ErrRD1} = webmachine_request:load_dispatch_data(Bindings,HostTokens,Port,PathTokens,AppRoot,StringPath,ReqDispatch),
{ok, ErrRD2} = webmachine_request:set_metadata(controller_module_error, Mod, ErrRD1),
{ok, ErrRD3} = webmachine_request:set_metadata(error_reason, Reason, ErrRD2),
render_error(ResponseCode, ErrResource, ErrRD3, Mod);
when is_integer(ResponseCode), ResponseCode >= 400, ResponseCode =< 500 ->
handle_stop_request(ErrorHandler, ResponseCode, Reason, ReqDispatch, Mod, ModOpts,
Bindings,HostTokens,Port,PathTokens,AppRoot,StringPath,ReqDispatch);
throw:{stop_request, 500} ->
error_logger:error_msg("~p:~p stop_request ~p (stacktrace ~p)", [?MODULE, ?LINE, 500, erlang:get_stacktrace()]),
handle_stop_request(ErrorHandler, 500, undefined, ReqDispatch, Mod, ModOpts,
Bindings,HostTokens,Port,PathTokens,AppRoot,StringPath, ReqDispatch);
throw:{stop_request, ResponseCode}
when ErrorHandler =:= controller, is_integer(ResponseCode), ResponseCode >= 400, ResponseCode =< 500 ->
{ok, ErrResource} = webmachine_controller:init(ReqDispatch, controller_http_error, ModOpts),
{ok, ErrRD1} = webmachine_request:load_dispatch_data(Bindings,HostTokens,Port,PathTokens,AppRoot,StringPath,ReqDispatch),
{ok, ErrRD2} = webmachine_request:set_metadata(controller_module_error, Mod, ErrRD1),
render_error(ResponseCode, ErrResource, ErrRD2, Mod);
throw:{stop_request, ResponseCode} when is_integer(ResponseCode) ->
when is_integer(ResponseCode), ResponseCode >= 400, ResponseCode =< 500 ->
handle_stop_request(ErrorHandler, ResponseCode, undefined, ReqDispatch, Mod, ModOpts,
Bindings,HostTokens,Port,PathTokens,AppRoot,StringPath,ReqDispatch);
throw:{stop_request, ResponseCode}
when is_integer(ResponseCode) ->
{ok,RD3} = webmachine_request:send_response(RD2#wm_reqdata{response_code=ResponseCode}),
webmachine_controller:stop(Resource, RD3),
webmachine_decision_core:do_log(webmachine_request:log_data(RD3));
error:{throw, Error} when ErrorHandler =:= controller ->
{ok, ErrResource} = webmachine_controller:init(ReqDispatch, controller_http_error, ModOpts),
{ok, ErrRD1} = webmachine_request:load_dispatch_data(Bindings,HostTokens,Port,PathTokens,AppRoot,StringPath,ReqDispatch),
{ok, ErrRD2} = webmachine_request:set_metadata(controller_module_error, Mod, ErrRD1),
{ok, ErrRD3} = webmachine_request:set_metadata(error_reason, {error, {throw, Error, erlang:get_stacktrace()}}, ErrRD2),
render_error(500, ErrResource, ErrRD3, Mod);
throw:Error ->
Reason = {error, {throw, Error, erlang:get_stacktrace()}},
handle_stop_request(ErrorHandler, 500, Reason, ReqDispatch, Mod, ModOpts,
Bindings,HostTokens,Port,PathTokens,AppRoot,StringPath,ReqDispatch);
error:{badmatch, {error, Error}} when Error =:= epipe; Error =:= enotconn ->
error_logger:info_msg("~p:~p Dropped connection (~p) on ~p ~p", [?MODULE, ?LINE, Error, Host, Path]),
erlang:put(mochiweb_request_force_close, true);
error:Error ->
error_logger:warning_msg("~p:~p caught error ~p (stacktrace ~p)", [?MODULE, ?LINE, Error, erlang:get_stacktrace()]),
error_logger:error_msg("~p:~p caught error ~p (stacktrace ~p)", [?MODULE, ?LINE, Error, erlang:get_stacktrace()]),
{ok,RD3} = webmachine_request:send_response(RD2#wm_reqdata{response_code=500}),
webmachine_controller:stop(Resource, RD3),
webmachine_decision_core:do_log(webmachine_request:log_data(RD3))
Expand All @@ -154,6 +156,21 @@ loop(MochiReq, LoopOpts) ->
nop
end.


handle_stop_request(controller, ResponseCode, Reason, ReqDispatch, Mod, ModOpts,
Bindings, HostTokens, Port, PathTokens, AppRoot, StringPath, ReqDispatch) ->
{ok, ErrResource} = webmachine_controller:init(ReqDispatch, controller_http_error, ModOpts),
{ok, ErrRD1} = webmachine_request:load_dispatch_data(Bindings,HostTokens,Port,PathTokens,AppRoot,StringPath,ReqDispatch),
{ok, ErrRD2} = webmachine_request:set_metadata(controller_module_error, Mod, ErrRD1),
{ok, ErrRD3} = webmachine_request:set_metadata(error_reason, Reason, ErrRD2),
render_error(ResponseCode, ErrResource, ErrRD3, Mod);
handle_stop_request(_ErrorHandler, ResponseCode, _Reason, ReqDispatch, Mod, ModOpts,
_Bindings, _HostTokens, _Port, _PathTokens, _AppRoot, _StringPath, RD) ->
{ok, Resource} = webmachine_controller:init(ReqDispatch, Mod, ModOpts),
{ok,RD3} = webmachine_request:send_response(RD#wm_reqdata{response_code=ResponseCode}),
webmachine_controller:stop(Resource, RD3),
webmachine_decision_core:do_log(webmachine_request:log_data(RD3)).

no_dispatch_match(ReqDispatch) ->
no_dispatch_match(wrq:method(ReqDispatch), ReqDispatch).

Expand Down

0 comments on commit 64d76a9

Please sign in to comment.