diff options
| -rw-r--r-- | src/ejabberd_sm.erl | 4 | ||||
| -rw-r--r-- | src/mod_push.erl | 1 | ||||
| -rw-r--r-- | test/push_tests.erl | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl index d93e66473..96dbb4e83 100644 --- a/src/ejabberd_sm.erl +++ b/src/ejabberd_sm.erl @@ -317,8 +317,8 @@ get_session_sids(User, Server) -> LUser = jid:nodeprep(User), LServer = jid:nameprep(Server), Mod = get_sm_backend(LServer), - OnlineSs = online(get_sessions(Mod, LUser, LServer)), - [SID || #session{sid = SID} <- OnlineSs]. + Sessions = online(get_sessions(Mod, LUser, LServer)), + [SID || #session{sid = SID} <- Sessions]. -spec set_offline_info(sid(), binary(), binary(), binary(), info()) -> ok. diff --git a/src/mod_push.erl b/src/mod_push.erl index 90f4ba55e..2ca0bf525 100644 --- a/src/mod_push.erl +++ b/src/mod_push.erl @@ -546,7 +546,6 @@ delete_sessions(LUser, LServer, LookupFun, Mod) -> -> [push_session()]. drop_online_sessions(LUser, LServer, Clients) -> SessIDs = ejabberd_sm:get_session_sids(LUser, LServer), - ?WARNING_MSG("SessIDs: ~p", [SessIDs]), [Client || {TS, _, _, _} = Client <- Clients, lists:keyfind(TS, 1, SessIDs) == false]. diff --git a/test/push_tests.erl b/test/push_tests.erl index 04840bad5..b1f3a8b78 100644 --- a/test/push_tests.erl +++ b/test/push_tests.erl @@ -134,6 +134,8 @@ mam_slave(Config) -> self_presence(Config, available), ct:comment("Receiving message from offline storage"), recv_test_message(Config), + %% Don't re-enable push notifications, otherwise the notification would be + %% suppressed while the slave is online. ct:comment("Enabling MAM"), ok = enable_mam(Config), ct:comment("Letting the master know that we're ready"), |