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

If big offline message queue, show only subset on WebAdmin (EJAB-1095)

Browse Source 
SVN Revision: 2898
This commit is contained in:
Badlop 2010-01-13 00:00:34 +00:00
parent 4639c0faf0
commit e948aafeca
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mod_offline.erl
View File

@ -606,7 +606,7 @@ webadmin_page(_, Host,
webadmin_page(Acc, _, _) -> Acc. webadmin_page(Acc, _, _) -> Acc.
user_queue(User, Server, Query, Lang) -> user_queue(User, Server, Query, Lang) ->
{US, Msgs, Res} = try {US, MsgsAll, Res} = try
US0 = { US0 = {
exmpp_stringprep:nodeprep(User), exmpp_stringprep:nodeprep(User),
exmpp_stringprep:nameprep(Server) exmpp_stringprep:nameprep(Server)
@ -621,6 +621,7 @@ user_queue(User, Server, Query, Lang) ->
_ -> _ ->
{{"invalid", "invalid"}, [], nothing} {{"invalid", "invalid"}, [], nothing}
end, end,
Msgs = get_messages_subset(User, Server, MsgsAll),
FMsgs = FMsgs =
lists:map( lists:map(
fun(#offline_msg{timestamp = TimeStamp, from = From, to = To, fun(#offline_msg{timestamp = TimeStamp, from = From, to = To,
@ -706,6 +707,27 @@ us_to_list({User, Server}) ->
get_queue_length(User, Server) -> get_queue_length(User, Server) ->
length(mnesia:dirty_read({offline_msg, {User, Server}})). length(mnesia:dirty_read({offline_msg, {User, Server}})).
get_messages_subset(User, Host, MsgsAll) ->
Access = gen_mod:get_module_opt(Host, ?MODULE, access_max_user_messages,
max_user_offline_messages),
MaxOfflineMsgs = case get_max_user_messages(Access, User, Host) of
Number when is_integer(Number) -> Number;
_ -> 100
end,
Length = length(MsgsAll),
get_messages_subset2(MaxOfflineMsgs, Length, MsgsAll).
get_messages_subset2(Max, Length, MsgsAll) when Length =< Max*2 ->
MsgsAll;
get_messages_subset2(Max, Length, MsgsAll) ->
FirstN = Max,
{MsgsFirstN, Msgs2} = lists:split(FirstN, MsgsAll),
MsgsLastN = lists:nthtail(Length - FirstN - FirstN, Msgs2),
NoJID = exmpp_jid:make("...", "...", ""),
IntermediateMsg = #offline_msg{timestamp = now(), from = NoJID, to = NoJID,
packet = exmpp_xml:element("...")},
MsgsFirstN ++ [IntermediateMsg] ++ MsgsLastN.
webadmin_user(Acc, User, Server, Lang) -> webadmin_user(Acc, User, Server, Lang) ->
QueueLen = get_queue_length(exmpp_stringprep:nodeprep(User), exmpp_stringprep:nameprep(Server)), QueueLen = get_queue_length(exmpp_stringprep:nodeprep(User), exmpp_stringprep:nameprep(Server)),
FQueueLen = [?AC("queue/", integer_to_list(QueueLen))], FQueueLen = [?AC("queue/", integer_to_list(QueueLen))],

22
src/mod_offline_odbc.erl
View File

@ -373,7 +373,7 @@ webadmin_page(_, Host,
webadmin_page(Acc, _, _) -> Acc. webadmin_page(Acc, _, _) -> Acc.
user_queue(User, Server, Query, Lang) -> user_queue(User, Server, Query, Lang) ->
{US, Msgs, Res} = try {US, MsgsAll, Res} = try
LUser = exmpp_stringprep:nodeprep(User), LUser = exmpp_stringprep:nodeprep(User),
LServer = exmpp_stringprep:nameprep(Server), LServer = exmpp_stringprep:nameprep(Server),
Username = ejabberd_odbc:escape(LUser), Username = ejabberd_odbc:escape(LUser),
@ -405,6 +405,7 @@ user_queue(User, Server, Query, Lang) ->
_ -> _ ->
{{"invalid", "invalid"}, [], nothing} {{"invalid", "invalid"}, [], nothing}
end, end,
Msgs = get_messages_subset(User, Server, MsgsAll),
FMsgs = FMsgs =
lists:map( lists:map(
fun(#xmlel{} = Msg) -> fun(#xmlel{} = Msg) ->
@ -507,6 +508,25 @@ get_queue_length(Username, LServer) ->
0 0
end. end.
get_messages_subset(User, Host, MsgsAll) ->
Access = gen_mod:get_module_opt(Host, ?MODULE, access_max_user_messages,
max_user_offline_messages),
MaxOfflineMsgs = case get_max_user_messages(Access, User, Host) of
Number when is_integer(Number) -> Number;
_ -> 100
end,
Length = length(MsgsAll),
get_messages_subset2(MaxOfflineMsgs, Length, MsgsAll).
get_messages_subset2(Max, Length, MsgsAll) when Length =< Max*2 ->
MsgsAll;
get_messages_subset2(Max, Length, MsgsAll) ->
FirstN = Max,
{MsgsFirstN, Msgs2} = lists:split(FirstN, MsgsAll),
MsgsLastN = lists:nthtail(Length - FirstN - FirstN, Msgs2),
IntermediateMsg = exmpp_xml:element("..."),
MsgsFirstN ++ [IntermediateMsg] ++ MsgsLastN.
webadmin_user(Acc, User, Server, Lang) -> webadmin_user(Acc, User, Server, Lang) ->
LUser = exmpp_stringprep:nodeprep(User), LUser = exmpp_stringprep:nodeprep(User),
LServer = exmpp_stringprep:nameprep(Server), LServer = exmpp_stringprep:nameprep(Server),