X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fstoragemanager.lua;h=5674ff32cdf2dc9501980e4d3543a462eb085c44;hb=38145a934e37c615fbab1626f24c9eb0ec3012ac;hp=3379cc0c748f97438e713886c312021d0baa642a;hpb=e8fa62e49b402cfa5770b6b9ae7a5ca0057f010a;p=prosody.git

diff --git a/core/storagemanager.lua b/core/storagemanager.lua
index 3379cc0c..5674ff32 100644
--- 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);
@@ -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);
@@ -78,15 +78,15 @@ function get_driver(host, store)
 		driver = null_storage_driver;
 	end
 	return driver, driver_name;
-	end
-	
+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
@@ -94,17 +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.list_stores(username, host)
-	return get_driver(host):list_stores(username, host);
+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 get_driver(host):purge(username, host);
+	return purge(username, host);
 end
 
 return _M;