modulemanager: Removed an unused variable.

[prosody.git] / core / storagemanager.lua

diff --git a/core/storagemanager.lua b/core/storagemanager.lua
index e0c12190bd4e9fdc70a5586af786cacd6ada8c93..43409960347fe2baef73023092208de416052724 100644 (file)
--- a/core/storagemanager.lua
+++ b/core/storagemanager.lua
@@ -46,7 +46,10 @@ local function load_driver(host, driver_name)
        local driver = stores_available:get(host, driver_name);
        if driver then return driver; end
        if driver_name ~= "internal" then
-               modulemanager.load(host, "storage_"..driver_name);
+               local ok, err = modulemanager.load(host, "storage_"..driver_name);
+               if not ok then
+                       log("error", "Failed to load storage driver plugin %s: %s", driver_name, err);
+               end
                return stores_available:get(host, driver_name);
        else
                return setmetatable({host = host}, default_driver_mt);
@@ -68,7 +71,8 @@ function open(host, store, typ)
                driver_name = config.get(host, "core", "default_storage");
                driver = load_driver(host, driver_name);
                if not driver then
-                       if storage or driver_name then
+                       if driver_name or (type(storage) == "string"
+                       or type(storage) == "table" and storage[store]) then
                                log("warn", "Falling back to default driver for %s storage on %s", store, host);
                        end
                        driver_name = "internal";