yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash if peer closed the connection (#2120) 

Prior to this fix, we'll get the following crash if we connected to
another emqx broker but got refused because of wrong username or password.
This commit is contained in:
Shawn 2019-01-07 11:40:05 +08:00 committed by turtleDeng
parent 9f83544fce
commit cb93a356a0
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/emqx_client.erl
View File

@ -715,7 +715,17 @@ waiting_for_connack(timeout, _Timeout, State) ->
end; end;
waiting_for_connack(EventType, EventContent, State) -> waiting_for_connack(EventType, EventContent, State) ->
handle_event(EventType, EventContent, waiting_for_connack, State). case take_call(connect, State) of
{value, #call{from = From}, _State} ->
case handle_event(EventType, EventContent, waiting_for_connack, State) of
{stop, Reason, State} ->
Reply = {error, {Reason, EventContent}},
{stop_and_reply, Reason, [{reply, From, Reply}]};
StateCallbackResult ->
StateCallbackResult
end;
false -> {stop, connack_timeout}
end.
connected({call, From}, subscriptions, State = #state{subscriptions = Subscriptions}) -> connected({call, From}, subscriptions, State = #state{subscriptions = Subscriptions}) ->
{keep_state, State, [{reply, From, maps:to_list(Subscriptions)}]}; {keep_state, State, [{reply, From, maps:to_list(Subscriptions)}]};
@ -999,8 +1009,8 @@ handle_event(info, {Closed, _Sock}, _StateName, State)
when Closed =:= tcp_closed; Closed =:= ssl_closed -> when Closed =:= tcp_closed; Closed =:= ssl_closed ->
{stop, {shutdown, Closed}, State}; {stop, {shutdown, Closed}, State};
handle_event(info, {'EXIT', Owner, Reason}, _, #state{owner = Owner}) -> handle_event(info, {'EXIT', Owner, Reason}, _, State = #state{owner = Owner}) ->
{stop, Reason}; {stop, Reason, State};
handle_event(info, {inet_reply, _Sock, ok}, _, State) -> handle_event(info, {inet_reply, _Sock, ok}, _, State) ->
{keep_state, State}; {keep_state, State};