Merge 0.10->trunk

[prosody.git] / core / storagemanager.lua

diff --git a/core/storagemanager.lua b/core/storagemanager.lua
index a01623ddd5b9d6d3f720165f911e333aa4ca67e1..046f496a2ca8c5e85b73d8e0d4e1076744ce5c8e 100644 (file)
--- a/core/storagemanager.lua
+++ b/core/storagemanager.lua
@@ -11,11 +11,10 @@ local log = require "util.logger".init("storagemanager");
 
 local prosody = prosody;
 
-module("storagemanager")
+local _ENV = nil;
 
 local olddm = {}; -- maintain old datamanager, for backwards compatibility
 for k,v in pairs(datamanager) do olddm[k] = v; end
-_M.olddm = olddm;
 
 local null_storage_method = function () return false, "no data storage active"; end
 local null_storage_driver = setmetatable(
@@ -31,7 +30,7 @@ local null_storage_driver = setmetatable(
 
 local stores_available = multitable.new();
 
-function initialize_host(host)
+local function initialize_host(host)
        local host_session = hosts[host];
        host_session.events.add_handler("item-added/storage-provider", function (event)
                local item = event.item;
@@ -45,7 +44,7 @@ function initialize_host(host)
 end
 prosody.events.add_handler("host-activated", initialize_host, 101);
 
-function load_driver(host, driver_name)
+local function load_driver(host, driver_name)
        if driver_name == "null" then
                return null_storage_driver;
        end
@@ -58,7 +57,7 @@ function load_driver(host, driver_name)
        return stores_available:get(host, driver_name);
 end
 
-function get_driver(host, store)
+local function get_driver(host, store)
        local storage = config.get(host, "storage");
        local driver_name;
        local option_type = type(storage);
@@ -101,6 +100,9 @@ local map_shim_mt = {
                end;
        };
 }
+
+local open; -- forward declaration
+
 local function create_map_shim(host, store)
        local keyval_store, err = open(host, store, "keyval");
        if keyval_store == nil then return nil, err end
@@ -127,14 +129,19 @@ function open(host, store, typ)
        return ret, err;
 end
 
-function purge(user, host)
+local 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);
+               for store, driver_name in pairs(storage) do
+                       if not purged[driver_name] then
+                               local driver = get_driver(host, store);
+                               if driver.purge then
+                                       purged[driver_name] = driver:purge(user);
+                               else
+                                       log("warn", "Storage driver %s does not support removing all user data, you may need to delete it manually", driver_name);
+                               end
                        end
                end
        end
@@ -165,4 +172,12 @@ function datamanager.purge(username, host)
        return purge(username, host);
 end
 
-return _M;
+return {
+       initialize_host = initialize_host;
+       load_driver = load_driver;
+       get_driver = get_driver;
+       open = open;
+       purge = purge;
+
+       olddm = olddm;
+};