diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/mod_offline.erl | 23 |
2 files changed, 13 insertions, 12 deletions
@@ -1,5 +1,7 @@ 2007-08-20 Alexey Shchepin <alexey@process-one.net> + * src/mod_offline.erl: Renamed MAX_OFFLINE_MSGS to MaxOfflineMsgs + * src/odbc/ejabberd_odbc_sup.erl: Add an odbc_pool_size config file option to choose the number of SQL connection in each pool (EJAB-58) (thanks to Jerome Sautret) diff --git a/src/mod_offline.erl b/src/mod_offline.erl index 2caf621d8..8a1b5e8b2 100644 --- a/src/mod_offline.erl +++ b/src/mod_offline.erl @@ -3,7 +3,6 @@ %%% Author : Alexey Shchepin <alexey@process-one.net> %%% Purpose : Store and manage offline messages in Mnesia database. %%% Created : 5 Jan 2003 by Alexey Shchepin <alexey@process-one.net> -%%% Id : $Id$ %%%---------------------------------------------------------------------- -module(mod_offline). @@ -43,25 +42,25 @@ start(Host, Opts) -> ?MODULE, remove_user, 50), ejabberd_hooks:add(anonymous_purge_hook, Host, ?MODULE, remove_user, 50), - MAX_OFFLINE_MSGS = gen_mod:get_opt(user_max_messages, Opts, infinity), + MaxOfflineMsgs = gen_mod:get_opt(user_max_messages, Opts, infinity), register(gen_mod:get_module_proc(Host, ?PROCNAME), - spawn(?MODULE, init, [MAX_OFFLINE_MSGS])). + spawn(?MODULE, init, [MaxOfflineMsgs])). -%% MAX_OFFLINE_MSGS is either infinity of integer > 0 +%% MaxOfflineMsgs is either infinity of integer > 0 init(infinity) -> loop(infinity); -init(MAX_OFFLINE_MSGS) - when integer(MAX_OFFLINE_MSGS), MAX_OFFLINE_MSGS > 0 -> - loop(MAX_OFFLINE_MSGS). +init(MaxOfflineMsgs) + when integer(MaxOfflineMsgs), MaxOfflineMsgs > 0 -> + loop(MaxOfflineMsgs). -loop(MAX_OFFLINE_MSGS) -> +loop(MaxOfflineMsgs) -> receive #offline_msg{us=US} = Msg -> Msgs = receive_all(US, [Msg]), Len = length(Msgs), F = fun() -> %% Only count messages if needed: - Count = if MAX_OFFLINE_MSGS =/= infinity -> + Count = if MaxOfflineMsgs =/= infinity -> Len + p1_mnesia:count_records( offline_msg, #offline_msg{us=US, _='_'}); @@ -69,7 +68,7 @@ loop(MAX_OFFLINE_MSGS) -> 0 end, if - Count > MAX_OFFLINE_MSGS -> + Count > MaxOfflineMsgs -> discard_warn_sender(Msgs); true -> if @@ -84,9 +83,9 @@ loop(MAX_OFFLINE_MSGS) -> end end, mnesia:transaction(F), - loop(MAX_OFFLINE_MSGS); + loop(MaxOfflineMsgs); _ -> - loop(MAX_OFFLINE_MSGS) + loop(MaxOfflineMsgs) end. receive_all(US, Msgs) -> |