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

refactor(persistent_sessions): code format changes after review

This commit is contained in:
Tobias Lindahl 2021-10-19 16:00:37 +02:00
parent 655d31726a
commit ec429857e0
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx/src/emqx_channel.erl
View File

@ -178,7 +178,7 @@ info(timers, #channel{timers = Timers}) -> Timers.
set_conn_state(ConnState, Channel) -> set_conn_state(ConnState, Channel) ->
Channel#channel{conn_state = ConnState}. Channel#channel{conn_state = ConnState}.
set_session(Session, Channel = Channel = #channel{conninfo = ConnInfo, clientinfo = ClientInfo}) -> set_session(Session, Channel = #channel{conninfo = ConnInfo, clientinfo = ClientInfo}) ->
%% Assume that this is also an updated session. Allow side effect. %% Assume that this is also an updated session. Allow side effect.
Session1 = emqx_persistent_session:persist(ClientInfo, ConnInfo, Session), Session1 = emqx_persistent_session:persist(ClientInfo, ConnInfo, Session),
Channel#channel{session = Session1}. Channel#channel{session = Session1}.

2
apps/emqx/src/emqx_session.erl
View File

@ -676,7 +676,7 @@ terminate(ClientInfo, discarded, Session) ->
run_hook('session.discarded', [ClientInfo, info(Session)]); run_hook('session.discarded', [ClientInfo, info(Session)]);
terminate(ClientInfo, takeovered, Session) -> terminate(ClientInfo, takeovered, Session) ->
run_hook('session.takeovered', [ClientInfo, info(Session)]); run_hook('session.takeovered', [ClientInfo, info(Session)]);
terminate(#{clientid :=_ClientId} = ClientInfo, Reason, Session) -> terminate(ClientInfo, Reason, Session) ->
run_hook('session.terminated', [ClientInfo, Reason, info(Session)]). run_hook('session.terminated', [ClientInfo, Reason, info(Session)]).
-compile({inline, [run_hook/2]}). -compile({inline, [run_hook/2]}).

2
apps/emqx/test/emqx_persistent_session_SUITE.erl
View File

@ -256,7 +256,7 @@ do_publish(Payloads = [_|_], PublishFun, Config) ->
{ok, Client} = emqtt:start_link([ {proto_ver, v5} {ok, Client} = emqtt:start_link([ {proto_ver, v5}
| Config]), | Config]),
{ok, _} = emqtt:ConnFun(Client), {ok, _} = emqtt:ConnFun(Client),
lists:foreach(fun(Payload) -> PublishFun(Client, Payload)end, Payloads), lists:foreach(fun(Payload) -> PublishFun(Client, Payload) end, Payloads),
ok = emqtt:disconnect(Client) ok = emqtt:disconnect(Client)
end), end),
receive receive