Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-20 16:15:59 +01:00
Code Releases Activity

Apply cosmetic changes to previous commit

Browse Source
This commit is contained in:
Holger Weiss 2017-08-18 16:50:08 +02:00
parent 13ad754ecc
commit ba9a79c89c
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ejabberd_sm.erl
View File

@ -317,8 +317,8 @@ get_session_sids(User, Server) ->
LUser = jid:nodeprep(User), LUser = jid:nodeprep(User),
LServer = jid:nameprep(Server), LServer = jid:nameprep(Server),
Mod = get_sm_backend(LServer), Mod = get_sm_backend(LServer),
OnlineSs = online(get_sessions(Mod, LUser, LServer)), Sessions = online(get_sessions(Mod, LUser, LServer)),
[SID || #session{sid = SID} <- OnlineSs]. [SID || #session{sid = SID} <- Sessions].
-spec set_offline_info(sid(), binary(), binary(), binary(), info()) -> ok. -spec set_offline_info(sid(), binary(), binary(), binary(), info()) -> ok.

1
src/mod_push.erl
View File

@ -546,7 +546,6 @@ delete_sessions(LUser, LServer, LookupFun, Mod) ->
-> [push_session()]. -> [push_session()].
drop_online_sessions(LUser, LServer, Clients) -> drop_online_sessions(LUser, LServer, Clients) ->
SessIDs = ejabberd_sm:get_session_sids(LUser, LServer), SessIDs = ejabberd_sm:get_session_sids(LUser, LServer),
?WARNING_MSG("SessIDs: ~p", [SessIDs]),
[Client || {TS, _, _, _} = Client <- Clients, [Client || {TS, _, _, _} = Client <- Clients,
lists:keyfind(TS, 1, SessIDs) == false]. lists:keyfind(TS, 1, SessIDs) == false].

2
test/push_tests.erl
View File

@ -134,6 +134,8 @@ mam_slave(Config) ->
self_presence(Config, available), self_presence(Config, available),
ct:comment("Receiving message from offline storage"), ct:comment("Receiving message from offline storage"),
recv_test_message(Config), 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"), ct:comment("Enabling MAM"),
ok = enable_mam(Config), ok = enable_mam(Config),
ct:comment("Letting the master know that we're ready"), ct:comment("Letting the master know that we're ready"),