From a313d1c722536710fb2bc29ec36e06b1cae99a37 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Wed, 18 Sep 2019 19:48:55 +0800 Subject: [PATCH] Improve the 'open_session/3' API --- src/emqx_cm.erl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/emqx_cm.erl b/src/emqx_cm.erl index 5f003807f..061d9aa4b 100644 --- a/src/emqx_cm.erl +++ b/src/emqx_cm.erl @@ -161,15 +161,15 @@ set_chan_stats(ClientId, ChanPid, Stats) -> present := boolean(), pendings => list()}} | {error, Reason :: term()}). -open_session(true, Client = #{client_id := ClientId}, Options) -> +open_session(true, ClientInfo = #{client_id := ClientId}, ConnInfo) -> CleanStart = fun(_) -> ok = discard_session(ClientId), - Session = emqx_session:init(Client, Options), + Session = emqx_session:init(ClientInfo, ConnInfo), {ok, #{session => Session, present => false}} end, emqx_cm_locker:trans(ClientId, CleanStart); -open_session(false, Client = #{client_id := ClientId}, Options) -> +open_session(false, ClientInfo = #{client_id := ClientId}, ConnInfo) -> ResumeStart = fun(_) -> case takeover_session(ClientId) of {ok, ConnMod, ChanPid, Session} -> @@ -179,7 +179,7 @@ open_session(false, Client = #{client_id := ClientId}, Options) -> present => true, pendings => Pendings}}; {error, not_found} -> - Session = emqx_session:init(Client, Options), + Session = emqx_session:init(ClientInfo, ConnInfo), {ok, #{session => Session, present => false}} end end,