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

Merge pull request #3458 from emqx/issue#3455

This commit is contained in:
turtleDeng 2020-05-12 10:34:43 +08:00 committed by GitHub
parent f5ed95ba17 36b8765009
commit d6ab5f0703
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/emqx_channel.erl
View File

@ -843,10 +843,10 @@ handle_timeout(_TRef, expire_awaiting_rel,
handle_timeout(_TRef, expire_awaiting_rel,
Channel = #channel{session = Session}) ->
case emqx_session:expire(awaiting_rel, Session) of
{ok, Session} ->
{ok, clean_timer(await_timer, Channel#channel{session = Session})};
{ok, Timeout, Session} ->
{ok, reset_timer(await_timer, Timeout, Channel#channel{session = Session})}
{ok, NSession} ->
{ok, clean_timer(await_timer, Channel#channel{session = NSession})};
{ok, Timeout, NSession} ->
{ok, reset_timer(await_timer, Timeout, Channel#channel{session = NSession})}
end;
handle_timeout(_TRef, expire_session, Channel) ->