portmanager, s2smanager, sessionmanager, stanza_router, storagemanager, usermanager...

[prosody.git] / core / storagemanager.lua

diff --git a/core/storagemanager.lua b/core/storagemanager.lua
index 29cad2fff353b78a44af1da364a1377085b992fb..0b6679d87c8acd237dcfcd2f92091e3f5c39bd06 100644 (file)
--- a/core/storagemanager.lua
+++ b/core/storagemanager.lua
@@ -1,5 +1,5 @@
 
-local error, type, pairs = error, type, pairs;
+local type, pairs = type, pairs;
 local setmetatable = setmetatable;
 
 local config = require "core.configmanager";
@@ -23,7 +23,7 @@ local null_storage_driver = setmetatable(
                name = "null",
                open = function (self) return self; end
        }, {
-               __index = function (self, method)
+               __index = function (self, method) --luacheck: ignore 212
                        return null_storage_method;
                end
        }
@@ -33,12 +33,12 @@ local stores_available = multitable.new();
 
 function initialize_host(host)
        local host_session = hosts[host];
-       host_session.events.add_handler("item-added/data-driver", function (event)
+       host_session.events.add_handler("item-added/storage-provider", function (event)
                local item = event.item;
                stores_available:set(host, item.name, item);
        end);
-       
-       host_session.events.add_handler("item-removed/data-driver", function (event)
+
+       host_session.events.add_handler("item-removed/storage-provider", function (event)
                local item = event.item;
                stores_available:set(host, item.name, nil);
        end);
@@ -59,7 +59,7 @@ function load_driver(host, driver_name)
 end
 
 function get_driver(host, store)
-       local storage = config.get(host, "core", "storage");
+       local storage = config.get(host, "storage");
        local driver_name;
        local option_type = type(storage);
        if option_type == "string" then
@@ -68,9 +68,9 @@ function get_driver(host, store)
                driver_name = storage[store];
        end
        if not driver_name then
-               driver_name = config.get(host, "core", "default_storage") or "internal";
+               driver_name = config.get(host, "default_storage") or "internal";
        end
-       
+
        local driver = load_driver(host, driver_name);
        if not driver then
                log("warn", "Falling back to null driver for %s storage on %s", store, host);
@@ -86,7 +86,7 @@ function open(host, store, typ)
        if not ret then
                if err == "unsupported-store" then
                        log("debug", "Storage driver %s does not support store %s (%s), falling back to null driver",
-                               driver_name, store, typ);
+                               driver_name, store, typ or "<nil>");
                        ret = null_storage_driver;
                        err = nil;
                end
@@ -95,8 +95,7 @@ function open(host, store, typ)
 end
 
 function purge(user, host)
-       local storage = config.get(host, "core", "storage");
-       local driver_name;
+       local storage = config.get(host, "storage");
        if type(storage) == "table" then
                -- multiple storage backends in use that we need to purge
                local purged = {};
@@ -119,11 +118,18 @@ end
 function datamanager.store(username, host, datastore, data)
        return open(host, datastore):set(username, data);
 end
+function datamanager.users(host, datastore, typ)
+       local driver = open(host, datastore, typ);
+       if not driver.users then
+               return function() log("warn", "storage driver %s does not support listing users", driver.name) end
+       end
+       return driver:users();
+end
 function datamanager.stores(username, host, typ)
        return get_driver(host):stores(username, typ);
 end
 function datamanager.purge(username, host)
-       return purge(username);
+       return purge(username, host);
 end
 
 return _M;