diff options
| author | Paweł Chmielowski <pchmielowski@process-one.net> | 2019-07-01 14:30:21 +0200 |
|---|---|---|
| committer | Paweł Chmielowski <pchmielowski@process-one.net> | 2019-07-01 14:30:39 +0200 |
| commit | 40c360c607d09d252c0db16aa6be73f087088764 (patch) | |
| tree | 3231569e3a1e0a9bca290e50042e9b9eaf8bcc7a /src | |
| parent | Fix a condition in ejabberd_auth_jwt (diff) | |
Invalidate proper cache when using mam for offline in pop_messages
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_offline.erl | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/mod_offline.erl b/src/mod_offline.erl index 3b41ac97d..d442bd5cb 100644 --- a/src/mod_offline.erl +++ b/src/mod_offline.erl @@ -84,7 +84,6 @@ %% default value for the maximum number of user messages -define(MAX_USER_MESSAGES, infinity). --define(EMPTY_SPOOL_CACHE, offline_empty_cache). -define(SPOOL_COUNTER_CACHE, offline_msg_counter_cache). -type c2s_state() :: ejabberd_c2s:state(). @@ -178,12 +177,6 @@ init_cache(Mod, Host, Opts) -> CacheOpts = [{max_size, mod_offline_opt:cache_size(Opts)}, {life_time, mod_offline_opt:cache_life_time(Opts)}, {cache_missed, false}], - case mod_offline_opt:use_mam_for_storage(Opts) of - true -> - ets_cache:new(?EMPTY_SPOOL_CACHE, CacheOpts); - false -> - ets_cache:delete(?EMPTY_SPOOL_CACHE) - end, case use_cache(Mod, Host) of true -> ets_cache:new(?SPOOL_COUNTER_CACHE, CacheOpts); @@ -626,8 +619,7 @@ route_offline_messages(#{jid := #jid{luser = LUser, lserver = LServer}} = State) {ok, OffMsgs} -> case use_mam_for_user(LUser, LServer) of true -> - ets_cache:delete(?EMPTY_SPOOL_CACHE, {LUser, LServer}, - ejabberd_cluster:get_nodes()), + flush_cache(Mod, LUser, LServer), lists:map( fun({_, #message{from = From, to = To} = Msg}) -> #offline_msg{from = From, to = To, |