Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-24 17:29:28 +01:00
Code Releases Activity

Fix get_sessions/2 function

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2010-12-16 23:47:53 +09:00
parent 3c51ca06d5
commit 405e9b24b0
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod_admin_p1.erl
View File

@ -1298,12 +1298,14 @@ get_resources2(User, Server) ->
end, get_sessions(User, Server)).
get_sessions(User, Server) ->
LUser = jlib:nodeprep(User),
LServer = jlib:nameprep(Server),
case catch mnesia:dirty_index_read(session, {LUser, LServer}, #session.us) of
{'EXIT', _Reason} -> [];
[] -> [];
Result -> lists:reverse(lists:keysort(#session.priority, clean_session_list(Result)))
US = {jlib:nodeprep(User), jlib:nameprep(Server)},
Node = ejabberd_cluster:get_node(US),
case catch rpc:call(Node, mnesia, dirty_index_read,
[session, US, #session.us], 5000) of
Result when is_list(Result), Result /= [] ->
lists:reverse(lists:keysort(#session.priority, clean_session_list(Result)));
_ ->
[]
end.
clean_session_list(Ss) ->

14
src/mod_xmlrpc.erl
View File

@ -1023,12 +1023,14 @@ get_resources(User, Server) ->
end, get_sessions(User, Server)).
get_sessions(User, Server) ->
LUser = jlib:nodeprep(User),
LServer = jlib:nameprep(Server),
case catch mnesia:dirty_index_read(session, {LUser, LServer}, #session.us) of
{'EXIT', _Reason} -> [];
[] -> [];
Result -> lists:reverse(lists:keysort(#session.priority, clean_session_list(Result)))
US = {jlib:nodeprep(User), jlib:nameprep(Server)},
Node = ejabberd_cluster:get_node(US),
case catch rpc:call(Node, mnesia, dirty_index_read,
[session, US, #session.us], 5000) of
Result when is_list(Result), Result /= [] ->
lists:reverse(lists:keysort(#session.priority, clean_session_list(Result)));
_ ->
[]
end.
clean_session_list(Ss) ->