diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cowboy_protocol.erl | 16 | ||||
| -rw-r--r-- | src/cowboy_rest.erl | 12 | ||||
| -rw-r--r-- | src/cowboy_websocket.erl | 14 |
3 files changed, 21 insertions, 21 deletions
diff --git a/src/cowboy_protocol.erl b/src/cowboy_protocol.erl index cbedbfa..0d15f32 100644 --- a/src/cowboy_protocol.erl +++ b/src/cowboy_protocol.erl @@ -497,12 +497,12 @@ handler_init(Req, State=#state{transport=Transport}, Handler, Opts) -> catch Class:Reason -> error_terminate(500, State), error_logger:error_msg( - "** Cowboy handler ~p terminating in init/3~n" + "** Cowboy handler ~p terminating in ~p/~p~n" " for the reason ~p:~p~n" "** Options were ~p~n" "** Request was ~p~n" "** Stacktrace: ~p~n~n", - [Handler, Class, Reason, Opts, + [Handler, init, 3, Class, Reason, Opts, cowboy_req:to_list(Req), erlang:get_stacktrace()]) end. @@ -522,12 +522,12 @@ handler_handle(Req, State, Handler, HandlerState) -> terminate_request(Req2, State, Handler, HandlerState2) catch Class:Reason -> error_logger:error_msg( - "** Cowboy handler ~p terminating in handle/2~n" + "** Cowboy handler ~p terminating in ~p/~p~n" " for the reason ~p:~p~n" "** Handler state was ~p~n" "** Request was ~p~n" "** Stacktrace: ~p~n~n", - [Handler, Class, Reason, HandlerState, + [Handler, handle, 2, Class, Reason, HandlerState, cowboy_req:to_list(Req), erlang:get_stacktrace()]), handler_terminate(Req, Handler, HandlerState), error_terminate(500, State) @@ -580,12 +580,12 @@ handler_call(Req, State, Handler, HandlerState, Message) -> Handler, HandlerState2) catch Class:Reason -> error_logger:error_msg( - "** Cowboy handler ~p terminating in info/3~n" + "** Cowboy handler ~p terminating in ~p/~p~n" " for the reason ~p:~p~n" "** Handler state was ~p~n" "** Request was ~p~n" "** Stacktrace: ~p~n~n", - [Handler, Class, Reason, HandlerState, + [Handler, info, 3, Class, Reason, HandlerState, cowboy_req:to_list(Req), erlang:get_stacktrace()]), handler_terminate(Req, Handler, HandlerState), error_terminate(500, State) @@ -597,12 +597,12 @@ handler_terminate(Req, Handler, HandlerState) -> Handler:terminate(cowboy_req:lock(Req), HandlerState) catch Class:Reason -> error_logger:error_msg( - "** Cowboy handler ~p terminating in terminate/2~n" + "** Cowboy handler ~p terminating in ~p/~p~n" " for the reason ~p:~p~n" "** Handler state was ~p~n" "** Request was ~p~n" "** Stacktrace: ~p~n~n", - [Handler, Class, Reason, HandlerState, + [Handler, terminate, 2, Class, Reason, HandlerState, cowboy_req:to_list(Req), erlang:get_stacktrace()]) end. diff --git a/src/cowboy_rest.erl b/src/cowboy_rest.erl index 35ca34d..c6b53bd 100644 --- a/src/cowboy_rest.erl +++ b/src/cowboy_rest.erl @@ -73,10 +73,10 @@ upgrade(_ListenerPid, Handler, Opts, Req) -> catch Class:Reason -> PLReq = cowboy_req:to_list(Req), error_logger:error_msg( - "** Cowboy handler ~p terminating in rest_init/2~n" + "** Cowboy handler ~p terminating in ~p/~p~n" " for the reason ~p:~p~n** Options were ~p~n" "** Request was ~p~n** Stacktrace: ~p~n~n", - [Handler, Class, Reason, Opts, PLReq, erlang:get_stacktrace()]), + [Handler, rest_init, 2, Class, Reason, Opts, PLReq, erlang:get_stacktrace()]), {ok, _Req2} = cowboy_req:reply(500, Req), close end. @@ -735,9 +735,9 @@ choose_content_type(Req, no_call -> error_logger:error_msg( "** Cowboy handler ~p terminating; " - "function ~p was not exported~n" + "function ~p/~p was not exported~n" "** Request was ~p~n** State was ~p~n~n", - [Handler, Fun, cowboy_req:to_list(Req), HandlerState]), + [Handler, Fun, 2, cowboy_req:to_list(Req), HandlerState]), {ok, _} = cowboy_req:reply(500, Req), close; {halt, Req2, HandlerState} -> @@ -787,9 +787,9 @@ set_resp_body(Req, State=#state{handler=Handler, handler_state=HandlerState, no_call -> error_logger:error_msg( "** Cowboy handler ~p terminating; " - "function ~p was not exported~n" + "function ~p/~p was not exported~n" "** Request was ~p~n** State was ~p~n~n", - [Handler, Fun, cowboy_req:to_list(Req5), HandlerState]), + [Handler, Fun, 2, cowboy_req:to_list(Req5), HandlerState]), {ok, _} = cowboy_req:reply(500, Req5), close; {halt, Req6, HandlerState} -> diff --git a/src/cowboy_websocket.erl b/src/cowboy_websocket.erl index 02431b8..8b01522 100644 --- a/src/cowboy_websocket.erl +++ b/src/cowboy_websocket.erl @@ -130,12 +130,12 @@ handler_init(State=#state{transport=Transport, handler=Handler, opts=Opts}, closed catch Class:Reason -> upgrade_error(Req), - PLReq = cowboy_req:to_list(Req), error_logger:error_msg( - "** Cowboy handler ~p terminating in websocket_init/3~n" + "** Cowboy handler ~p terminating in ~p/~p~n" " for the reason ~p:~p~n** Options were ~p~n" "** Request was ~p~n** Stacktrace: ~p~n~n", - [Handler, Class, Reason, Opts, PLReq, erlang:get_stacktrace()]) + [Handler, websocket_init, 3, Class, Reason, Opts, + cowboy_req:to_list(Req),erlang:get_stacktrace()]) end. -spec upgrade_error(cowboy_req:req()) -> closed. @@ -507,11 +507,11 @@ handler_call(State=#state{handler=Handler, opts=Opts}, Req, HandlerState, catch Class:Reason -> PLReq = cowboy_req:to_list(Req), error_logger:error_msg( - "** Cowboy handler ~p terminating in ~p/3~n" + "** Cowboy handler ~p terminating in ~p/~p~n" " for the reason ~p:~p~n** Message was ~p~n" "** Options were ~p~n** Handler state was ~p~n" "** Request was ~p~n** Stacktrace: ~p~n~n", - [Handler, Callback, Class, Reason, Message, Opts, + [Handler, Callback, 3, Class, Reason, Message, Opts, HandlerState, PLReq, erlang:get_stacktrace()]), websocket_close(State, Req, HandlerState, {error, handler}) end. @@ -598,11 +598,11 @@ handler_terminate(#state{handler=Handler, opts=Opts}, catch Class:Reason -> PLReq = cowboy_req:to_list(Req), error_logger:error_msg( - "** Cowboy handler ~p terminating in websocket_terminate/3~n" + "** Cowboy handler ~p terminating in ~p/~p~n" " for the reason ~p:~p~n** Initial reason was ~p~n" "** Options were ~p~n** Handler state was ~p~n" "** Request was ~p~n** Stacktrace: ~p~n~n", - [Handler, Class, Reason, TerminateReason, Opts, + [Handler, websocket_terminate, 3, Class, Reason, TerminateReason, Opts, HandlerState, PLReq, erlang:get_stacktrace()]) end, closed. |