MUC: Produce an untracked, locked room on failure to read room from storage (#1091)

1 files changed, 5 insertions, 1 deletions

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 83ed4900..bd739315 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -148,13 +148,17 @@ end
 
 local function restore_room(jid)
 	local node = jid_split(jid);
-	local data = room_configs:get(node);
+	local data, err = room_configs:get(node);
 	local state = room_state:get(node);
 	if data then
 		module:log("debug", "Restoring room %s from storage", jid);
 		local room = muclib.restore_room(data, state);
 		track_room(room);
 		return room;
+	elseif err then
+		module:log("error", "Error restoring room %s from storage: %s", jid, err);
+		local room = muclib.new_room(jid, { locked = math.huge });
+		return room;
 	end
 end