From 707284db31112b645ca3831b244a0bd19577ef6f Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Tue, 8 Feb 2022 18:49:38 +0800 Subject: [PATCH] fix(session): update calling to session APIs --- apps/emqx/src/emqx_persistent_session.erl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/emqx/src/emqx_persistent_session.erl b/apps/emqx/src/emqx_persistent_session.erl index e625b8fbd..4d6798834 100644 --- a/apps/emqx/src/emqx_persistent_session.erl +++ b/apps/emqx/src/emqx_persistent_session.erl @@ -266,14 +266,14 @@ resume(ClientInfo = #{clientid := ClientID}, ConnInfo, Session) -> %% 1. Get pending messages from DB. ?tp(ps_initial_pendings, #{sid => SessionID}), Pendings1 = pending(SessionID), - Pendings2 = emqx_session:ignore_local(Pendings1, ClientID, Session), + Pendings2 = emqx_session:ignore_local(ClientInfo, Pendings1, ClientID, Session), ?tp(ps_got_initial_pendings, #{ sid => SessionID , msgs => Pendings1}), %% 2. Enqueue messages to mimic that the process was alive %% when the messages were delivered. ?tp(ps_persist_pendings, #{sid => SessionID}), - Session1 = emqx_session:enqueue(Pendings2, Session), + Session1 = emqx_session:enqueue(ClientInfo, Pendings2, Session), Session2 = persist(ClientInfo, ConnInfo, Session1), mark_as_delivered(SessionID, Pendings2), ?tp(ps_persist_pendings_msgs, #{ msgs => Pendings2 @@ -294,7 +294,7 @@ resume(ClientInfo = #{clientid := ClientID}, ConnInfo, Session) -> ?tp(ps_marker_pendings, #{sid => SessionID}), MarkerIDs = [Marker || {_, Marker} <- NodeMarkers], Pendings3 = pending(SessionID, MarkerIDs), - Pendings4 = emqx_session:ignore_local(Pendings3, ClientID, Session), + Pendings4 = emqx_session:ignore_local(ClientInfo, Pendings3, ClientID, Session), ?tp(ps_marker_pendings_msgs, #{ sid => SessionID , msgs => Pendings4}),