prosody-hg: plugins/muc/mod_muc.lua comparison

plugins/muc/mod_muc: Add 'local_only' flag to mod_muc, so rooms don't get restored on shutdown

author	daurnimator <quae@daurnimator.com>
date	Fri, 17 Oct 2014 16:35:46 -0400
parents	305226a9e581
children	6728ad041761

comparison

equal deleted inserted replaced

-:413923bbd1a0
+:d016437e01bf
 		end
 	end
 	return room
 end
-function each_room()
+function each_room(local_only)
-	for room_jid in pairs(persistent_rooms_storage:get(nil) or {}) do
+	if not local_only then
-		if rooms[room_jid] == nil then -- Don't restore rooms that already exist
+		for room_jid in pairs(persistent_rooms_storage:get(nil) or {}) do
-			local room = restore_room(room_jid);
+			if rooms[room_jid] == nil then -- Don't restore rooms that already exist
-			if room == nil then
+				local room = restore_room(room_jid);
-				module:log("error", "Missing data for room '%s', omitting from iteration", room_jid);
+				if room == nil then
+					module:log("error", "Missing data for room '%s', omitting from iteration", room_jid);
+				end
 			end
 		end
 	end
 	return iterators.values(rooms);
 end
 end
 function shutdown_component()
 	local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user"})
 		:tag("status", { code = "332"}):up();
-	for room in each_room() do
+	for room in each_room(true) do
 		room:clear(x);
 	end
 end
 module:hook_global("server-stopping", shutdown_component);

Mercurial > prosody-hg