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

Merge branch 'fix/websocket-check-error-on-send' of git://github.com/tillitech/cowboy

Browse source
This commit is contained in:
Loïc Hoguin 2012-11-27 16:42:02 +01:00
commit bb07b48d7f
1 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/cowboy_websocket.erl
View file

@ -452,22 +452,38 @@ handler_call(State=#state{handler=Handler, opts=Opts}, Req, HandlerState,
Req2, HandlerState2, RemainingData); Req2, HandlerState2, RemainingData);
{reply, Payload, Req2, HandlerState2} {reply, Payload, Req2, HandlerState2}
when is_tuple(Payload) -> when is_tuple(Payload) ->
ok = websocket_send(Payload, State), case websocket_send(Payload, State) of
ok ->
NextState(State, Req2, HandlerState2, RemainingData); NextState(State, Req2, HandlerState2, RemainingData);
{error, _} = Error ->
handler_terminate(State, Req2, HandlerState2, Error)
end;
{reply, Payload, Req2, HandlerState2, hibernate} {reply, Payload, Req2, HandlerState2, hibernate}
when is_tuple(Payload) -> when is_tuple(Payload) ->
ok = websocket_send(Payload, State), case websocket_send(Payload, State) of
ok ->
NextState(State#state{hibernate=true}, NextState(State#state{hibernate=true},
Req2, HandlerState2, RemainingData); Req2, HandlerState2, RemainingData);
{error, _} = Error ->
handler_terminate(State, Req2, HandlerState2, Error)
end;
{reply, Payload, Req2, HandlerState2} {reply, Payload, Req2, HandlerState2}
when is_list(Payload) -> when is_list(Payload) ->
ok = websocket_send_many(Payload, State), case websocket_send_many(Payload, State) of
ok ->
NextState(State, Req2, HandlerState2, RemainingData); NextState(State, Req2, HandlerState2, RemainingData);
{error, _} = Error ->
handler_terminate(State, Req2, HandlerState2, Error)
end;
{reply, Payload, Req2, HandlerState2, hibernate} {reply, Payload, Req2, HandlerState2, hibernate}
when is_list(Payload) -> when is_list(Payload) ->
ok = websocket_send_many(Payload, State), case websocket_send_many(Payload, State) of
ok ->
NextState(State#state{hibernate=true}, NextState(State#state{hibernate=true},
Req2, HandlerState2, RemainingData); Req2, HandlerState2, RemainingData);
{error, _} = Error ->
handler_terminate(State, Req2, HandlerState2, Error)
end;
{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 ->
@ -507,8 +523,10 @@ websocket_send({Type, Payload}, #state{socket=Socket, transport=Transport}) ->
websocket_send_many([], _) -> websocket_send_many([], _) ->
ok; ok;
websocket_send_many([Frame|Tail], State) -> websocket_send_many([Frame|Tail], State) ->
ok = websocket_send(Frame, State), case websocket_send(Frame, State) of
websocket_send_many(Tail, State). ok -> websocket_send_many(Tail, State);
Error -> Error
end.
-spec websocket_close(#state{}, cowboy_req:req(), any(), {atom(), atom()}) -spec websocket_close(#state{}, cowboy_req:req(), any(), {atom(), atom()})
-> closed. -> closed.