From 9cf13e5dcd6844be8be5260caa855743c4d94227 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 1 Mar 2011 06:12:43 +0000 Subject: mod_storage_sql: Display friendlier error when LuaDBI is missing --- plugins/mod_storage_sql.lua | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua index 7917958d..b88efb64 100644 --- a/plugins/mod_storage_sql.lua +++ b/plugins/mod_storage_sql.lua @@ -96,7 +96,18 @@ local function create_table() end do -- process options to get a db connection - DBI = require "DBI"; + local ok; + prosody.unlock_globals(); + ok, DBI = pcall(require, "DBI"); + if not ok then + package.loaded["DBI"] = {}; + module:log("error", "Failed to load the LuaDBI library for accessing SQL databases: %s", DBI); + module:log("error", "More information on installing LuaDBI can be found at http://prosody.im/doc/depends#luadbi"); + end + prosody.lock_globals(); + if not ok or not DBI.Connect then + return; -- Halt loading of this module + end params = params or { driver = "SQLite3" }; -- cgit v1.2.3