mod_admin_telnet: Add server:memory() command to view details of Prosody's memory...

[prosody.git] / core / storagemanager.lua

diff --git a/core/storagemanager.lua b/core/storagemanager.lua
index c96ef3ecb1415f14fa8b1ec4fafaeb7c4b4ef67b..1c82af6d8b2fdf9934d89e41a68e9fd536974c39 100644 (file)
--- a/core/storagemanager.lua
+++ b/core/storagemanager.lua
@@ -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);
@@ -47,7 +47,7 @@ prosody.events.add_handler("host-activated", initialize_host, 101);
 
 function load_driver(host, driver_name)
        if driver_name == "null" then
-               return null_storage_provider;
+               return null_storage_driver;
        end
        local driver = stores_available:get(host, driver_name);
        if driver then return driver; end
@@ -58,8 +58,8 @@ function load_driver(host, driver_name)
        return stores_available:get(host, driver_name);
 end
 
-function open(host, store, typ)
-       local storage = config.get(host, "core", "storage");
+function get_driver(host, store)
+       local storage = config.get(host, "storage");
        local driver_name;
        local option_type = type(storage);
        if option_type == "string" then
@@ -68,7 +68,7 @@ function open(host, store, typ)
                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);
@@ -77,12 +77,16 @@ function open(host, store, typ)
                driver_name = "null";
                driver = null_storage_driver;
        end
-       
+       return driver, driver_name;
+end
+
+function open(host, store, typ)
+       local driver, driver_name = get_driver(host, store);
        local ret, err = driver:open(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
@@ -90,11 +94,42 @@ function open(host, store, typ)
        return ret, err;
 end
 
+function purge(user, host)
+       local storage = config.get(host, "storage");
+       if type(storage) == "table" then
+               -- multiple storage backends in use that we need to purge
+               local purged = {};
+               for store, driver in pairs(storage) do
+                       if not purged[driver] then
+                               purged[driver] = get_driver(host, store):purge(user);
+                       end
+               end
+       end
+       get_driver(host):purge(user); -- and the default driver
+
+       olddm.purge(user, host); -- COMPAT list stores, like offline messages end up in the old datamanager
+
+       return true;
+end
+
 function datamanager.load(username, host, datastore)
        return open(host, datastore):get(username);
 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, host);
+end
 
 return _M;