umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-14 12:20:24 +00:00
Code Issues Wiki Activity

Call websocket_close/4 *after* throwing the error

Browse source 
This ensures that an error thrown in handler_terminate/4 will be
shown after the error from handler_call/6, in the expected order.

As we already call WebSocketHandler:terminate/3, this should
fix issue #23.
This commit is contained in:
Loïc Hoguin 2011-07-07 17:50:46 +02:00
parent 474f4e0bfa
commit 87366e36ad
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cowboy_http_websocket.erl
View file

@ -205,14 +205,14 @@ handler_call(State=#state{handler=Handler, opts=Opts}, Req, HandlerState,
{shutdown, Req2, HandlerState2} -> {shutdown, Req2, HandlerState2} ->
websocket_close(State, Req2, HandlerState2, {normal, shutdown}) websocket_close(State, Req2, HandlerState2, {normal, shutdown})
catch Class:Reason -> catch Class:Reason ->
websocket_close(State, Req, HandlerState, {error, handler}),
error_logger:error_msg( error_logger:error_msg(
"** Handler ~p terminating in websocket_handle/3~n" "** Handler ~p terminating in websocket_handle/3~n"
" for the reason ~p:~p~n** Message was ~p~n" " for the reason ~p:~p~n** Message was ~p~n"
"** Options were ~p~n** Handler state was ~p~n" "** Options were ~p~n** Handler state was ~p~n"
"** Request was ~p~n** Stacktrace: ~p~n~n", "** Request was ~p~n** Stacktrace: ~p~n~n",
[Handler, Class, Reason, Message, Opts, [Handler, Class, Reason, Message, Opts,
HandlerState, Req, erlang:get_stacktrace()]) HandlerState, Req, erlang:get_stacktrace()]),
websocket_close(State, Req, HandlerState, {error, handler})
end. end.
-spec websocket_send(binary(), #http_req{}) -> ok. -spec websocket_send(binary(), #http_req{}) -> ok.