Merge branch 'adt-consistent-errors' of git://github.com/Vagabond/cowboy

1 files changed, 8 insertions, 8 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.