X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fstoragemanager.lua;h=e44f3e2c78918d19c01eb3979657e312c32b0b16;hb=f3c3acf819d5a2511a39aecf17feab537bbcc07f;hp=d3e3e8078a3efd45e0566d9b801fa01ad59b8d1f;hpb=081a48ada0b00d514b3ddc118f1fa2d17b9eadda;p=prosody.git

diff --git a/core/storagemanager.lua b/core/storagemanager.lua
index d3e3e807..e44f3e2c 100644
--- a/core/storagemanager.lua
+++ b/core/storagemanager.lua
@@ -1,5 +1,5 @@
 
-local error, type = error, type;
+local error, type, pairs = error, type, pairs;
 local setmetatable = setmetatable;
 
 local config = require "core.configmanager";
@@ -9,18 +9,25 @@ local multitable = require "util.multitable";
 local hosts = hosts;
 local log = require "util.logger".init("storagemanager");
 
-local olddm = {}; -- maintain old datamanager, for backwards compatibility
-for k,v in pairs(datamanager) do olddm[k] = v; end
+local prosody = prosody;
 
 module("storagemanager")
 
-local default_driver_mt = { name = "internal" };
-default_driver_mt.__index = default_driver_mt;
-function default_driver_mt:open(store)
-	return setmetatable({ host = self.host, store = store }, default_driver_mt);
-end
-function default_driver_mt:get(user) return olddm.load(user, self.host, self.store); end
-function default_driver_mt:set(user, data) return olddm.store(user, self.host, self.store, data); end
+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(
+	{
+		name = "null",
+		open = function (self) return self; end
+	}, {
+		__index = function (self, method)
+			return null_storage_method;
+		end
+	}
+);
 
 local stores_available = multitable.new();
 
@@ -36,20 +43,19 @@ function initialize_host(host)
 		stores_available:set(host, item.name, nil);
 	end);
 end
+prosody.events.add_handler("host-activated", initialize_host, 101);
 
 local function load_driver(host, driver_name)
-	if not driver_name then
-		return;
+	if driver_name == "null" then
+		return null_storage_provider;
 	end
 	local driver = stores_available:get(host, driver_name);
-	if not driver then
-		if driver_name ~= "internal" then
-			modulemanager.load(host, "storage_"..driver_name);
-			return stores_available:get(host, driver_name);
-		else
-			return setmetatable({host = host}, default_driver_mt);
-		end
+	if driver then return driver; end
+	local ok, err = modulemanager.load(host, "storage_"..driver_name);
+	if not ok then
+		log("error", "Failed to load storage driver plugin %s on %s: %s", driver_name, host, err);
 	end
+	return stores_available:get(host, driver_name);
 end
 
 function open(host, store, typ)
@@ -61,26 +67,23 @@ function open(host, store, typ)
 	elseif option_type == "table" then
 		driver_name = storage[store];
 	end
+	if not driver_name then
+		driver_name = config.get(host, "core", "default_storage") or "internal";
+	end
 	
 	local driver = load_driver(host, driver_name);
 	if not driver then
-		driver_name = config.get(host, "core", "default_storage");
-		driver = load_driver(host, driver_name);
-		if not driver then
-			if storage or driver_name then
-				log("warn", "Falling back to default driver for %s storage on %s", store, host);
-			end
-			driver_name = "internal";
-			driver = load_driver(host, driver_name);
-		end
+		log("warn", "Falling back to null driver for %s storage on %s", store, host);
+		driver_name = "null";
+		driver = null_storage_driver;
 	end
 	
 	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 internal driver",
+			log("debug", "Storage driver %s does not support store %s (%s), falling back to null driver",
 				driver_name, store, typ);
-			ret = setmetatable({ host = host, store = store }, default_driver_mt); -- default to default driver
+			ret = null_storage_driver;
 			err = nil;
 		end
 	end