Software / code / prosody
Changeset
7414:1b62c89014c4
MUC: Separate force-save parameter from save-entire-state flag
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 29 Apr 2016 16:54:45 +0200 |
| parents | 7413:228396da1e27 |
| children | 7415:cbb05b454c13 |
| files | plugins/muc/mod_muc.lua plugins/muc/muc.lib.lua |
| diffstat | 2 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/muc/mod_muc.lua Fri Apr 29 14:01:01 2016 +0200 +++ b/plugins/muc/mod_muc.lua Fri Apr 29 16:54:45 2016 +0200 @@ -97,15 +97,15 @@ local room_items_cache = {}; -local function room_save(room, forced) +local function room_save(room, forced, savestate) local node = jid_split(room.jid); local is_persistent = persistent.get(room); room_items_cache[room.jid] = room:get_public() and room:get_name() or nil; - if is_persistent or forced then + if is_persistent or savestate then persistent_rooms:set(nil, room.jid, true); - local data = room:freeze(forced); + local data = room:freeze(savestate); return room_configs:set(node, data); - else + elseif forced then persistent_rooms:set(nil, room.jid, nil); return room_configs:set(node, nil); end @@ -113,7 +113,7 @@ local rooms = cache.new(module:get_option_number("muc_room_cache_size", 100), function (_, room) module:log("debug", "%s evicted", room); - room_save(room, true); -- Force to disk + room_save(room, nil, true); -- Force to disk end); -- Automatically destroy empty non-persistent rooms @@ -155,7 +155,7 @@ function module.unload() for room in rooms:values() do - room:save(true); + room:save(nil, true); forget_room(room); end end @@ -287,7 +287,7 @@ function shutdown_component() for room in each_room(true) do - room:save(true); + room:save(nil, true); end end module:hook_global("server-stopping", shutdown_component);
--- a/plugins/muc/muc.lib.lua Fri Apr 29 14:01:01 2016 +0200 +++ b/plugins/muc/muc.lib.lua Fri Apr 29 16:54:45 2016 +0200 @@ -769,7 +769,7 @@ end event.field, event.value = nil, nil; - self:save(); + self:save(true); origin.send(st.reply(stanza)); if next(event.status_codes) then @@ -852,7 +852,7 @@ else success, errtype, err = nil, "cancel", "bad-request"; end - self:save(); + self:save(true); if not success then origin.send(st.error_reply(stanza, errtype, err)); else @@ -1219,7 +1219,7 @@ end end - self:save(); + self:save(true); module:fire_event("muc-set-affiliation", { room = self;
