diff options
| -rw-r--r-- | src/mod_mam.erl | 6 | ||||
| -rw-r--r-- | src/mod_mam_mnesia.erl | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mod_mam.erl b/src/mod_mam.erl index d5b9a1680..693889c2c 100644 --- a/src/mod_mam.erl +++ b/src/mod_mam.erl @@ -581,8 +581,8 @@ delete_old_messages_batch(Server, Type, Days, BatchSize, Rate) when Type == <<"c case ejabberd_batch:register_task({mam, LServer}, 0, Rate, {LServer, TypeA, TimeStamp, BatchSize, none}, fun({L, T, St, B, IS} = S) -> - case {erlang:function_exported(Mod, remove_old_messages_batch, 4), - erlang:function_exported(Mod, remove_old_messages_batch, 5)} of + case {erlang:function_exported(Mod, delete_old_messages_batch, 4), + erlang:function_exported(Mod, delete_old_messages_batch, 5)} of {true, _} -> case Mod:delete_old_messages_batch(L, St, T, B) of {ok, Count} -> @@ -591,7 +591,7 @@ delete_old_messages_batch(Server, Type, Days, BatchSize, Rate) when Type == <<"c E end; {_, true} -> - case Mod:remove_old_messages_batch(L, St, T, B, IS) of + case Mod:delete_old_messages_batch(L, St, T, B, IS) of {ok, IS2, Count} -> {ok, {L, St, T, B, IS2}, Count}; {error, _} = E -> diff --git a/src/mod_mam_mnesia.erl b/src/mod_mam_mnesia.erl index 0fd459c67..8b8a4b91e 100644 --- a/src/mod_mam_mnesia.erl +++ b/src/mod_mam_mnesia.erl @@ -29,7 +29,7 @@ %% API -export([init/2, remove_user/2, remove_room/3, delete_old_messages/3, extended_fields/0, store/8, write_prefs/4, get_prefs/2, select/6, remove_from_archive/3, - is_empty_for_user/2, is_empty_for_room/3, remove_old_messages_batch/5]). + is_empty_for_user/2, is_empty_for_room/3, delete_old_messages_batch/5]). -include_lib("stdlib/include/ms_transform.hrl"). -include_lib("xmpp/include/xmpp.hrl"). @@ -155,7 +155,7 @@ delete_batch(LastUS, LServer, TS, Type, Num) -> _ -> delete_batch(mnesia:next(archive_msg, LastUS), LServer, TS, Type, Left) end. -remove_old_messages_batch(LServer, TimeStamp, Type, Batch, LastUS) -> +delete_old_messages_batch(LServer, TimeStamp, Type, Batch, LastUS) -> R = mnesia:transaction( fun() -> {Num, NextUS} = delete_batch(LastUS, LServer, TimeStamp, Type, Batch), |