aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-05-30 21:02:09 +0100
committerMatthew Wild <mwild1@gmail.com>2018-05-30 21:02:09 +0100
commitbf1391b08e71d1f6d077c6ef392a0a4e541b7e78 (patch)
tree294d03c60d7639a96851db574291745f289d3cf2 /plugins/muc
parent4aa93b912ff74a2fd9e34001370f433da928ee08 (diff)
downloadprosody-bf1391b08e71d1f6d077c6ef392a0a4e541b7e78.tar.gz
prosody-bf1391b08e71d1f6d077c6ef392a0a4e541b7e78.zip
MUC: Fix error logged when no persistent rooms present
Diffstat (limited to 'plugins/muc')
-rw-r--r--plugins/muc/mod_muc.lua7
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 7304b5b1..0f58bfbc 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -39,8 +39,11 @@ local rooms = rooms;
local persistent_rooms_storage = module:open_store("persistent");
local persistent_rooms, err = persistent_rooms_storage:get();
if not persistent_rooms then
- module:log("error", "Error loading list of persistent rooms from storage. Reload mod_muc or restart to recover.");
- assert(not err, err);
+ if err then
+ module:log("error", "Error loading list of persistent rooms from storage. Reload mod_muc or restart to recover.");
+ error("Storage error: "..err);
+ end
+ module:log("debug", "No persistent rooms found in the database");
persistent_rooms = {};
end
local room_configs = module:open_store("config");