prosody: core/storagemanager.lua@7699cef04740 (annotated)

3401 2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1
4085 7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: 4077 diff changeset	2	local error, type, pairs = error, type, pairs;
3401 2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	3	local setmetatable = setmetatable;
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	4
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	5	local config = require "core.configmanager";
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	6	local datamanager = require "util.datamanager";
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	7	local modulemanager = require "core.modulemanager";
3784 7383ac93fb27 storagemanager: Import util.multitable again Matthew Wild <mwild1@gmail.com> parents: 3783 diff changeset	8	local multitable = require "util.multitable";
3401 2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	9	local hosts = hosts;
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	10	local log = require "util.logger".init("storagemanager");
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	11
3850 39492ede0cf5 storagemanager: Hook "host-activated", to make sure we are notified about data drivers. Waqas Hussain <waqas20@gmail.com> parents: 3849 diff changeset	12	local prosody = prosody;
3401 2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	13
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	14	module("storagemanager")
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	15
4085 7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: 4077 diff changeset	16	local olddm = {}; -- maintain old datamanager, for backwards compatibility
7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: 4077 diff changeset	17	for k,v in pairs(datamanager) do olddm[k] = v; end
7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: 4077 diff changeset	18	_M.olddm = olddm;
7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: 4077 diff changeset	19
4076 00ce99071368 storagemanager: Add new "null" provider to get used when loading a driver or opening a store fails, instead of falling back to the default driver Matthew Wild <mwild1@gmail.com> parents: 4075 diff changeset	20	local null_storage_method = function () return false, "no data storage active"; end
00ce99071368 storagemanager: Add new "null" provider to get used when loading a driver or opening a store fails, instead of falling back to the default driver Matthew Wild <mwild1@gmail.com> parents: 4075 diff changeset	21	local null_storage_driver = setmetatable(
00ce99071368 storagemanager: Add new "null" provider to get used when loading a driver or opening a store fails, instead of falling back to the default driver Matthew Wild <mwild1@gmail.com> parents: 4075 diff changeset	22	{
00ce99071368 storagemanager: Add new "null" provider to get used when loading a driver or opening a store fails, instead of falling back to the default driver Matthew Wild <mwild1@gmail.com> parents: 4075 diff changeset	23	name = "null",
00ce99071368 storagemanager: Add new "null" provider to get used when loading a driver or opening a store fails, instead of falling back to the default driver Matthew Wild <mwild1@gmail.com> parents: 4075 diff changeset	24	open = function (self) return self; end
00ce99071368 storagemanager: Add new "null" provider to get used when loading a driver or opening a store fails, instead of falling back to the default driver Matthew Wild <mwild1@gmail.com> parents: 4075 diff changeset	25	}, {
00ce99071368 storagemanager: Add new "null" provider to get used when loading a driver or opening a store fails, instead of falling back to the default driver Matthew Wild <mwild1@gmail.com> parents: 4075 diff changeset	26	__index = function (self, method)
00ce99071368 storagemanager: Add new "null" provider to get used when loading a driver or opening a store fails, instead of falling back to the default driver Matthew Wild <mwild1@gmail.com> parents: 4075 diff changeset	27	return null_storage_method;
00ce99071368 storagemanager: Add new "null" provider to get used when loading a driver or opening a store fails, instead of falling back to the default driver Matthew Wild <mwild1@gmail.com> parents: 4075 diff changeset	28	end
00ce99071368 storagemanager: Add new "null" provider to get used when loading a driver or opening a store fails, instead of falling back to the default driver Matthew Wild <mwild1@gmail.com> parents: 4075 diff changeset	29	}
00ce99071368 storagemanager: Add new "null" provider to get used when loading a driver or opening a store fails, instead of falling back to the default driver Matthew Wild <mwild1@gmail.com> parents: 4075 diff changeset	30	);
00ce99071368 storagemanager: Add new "null" provider to get used when loading a driver or opening a store fails, instead of falling back to the default driver Matthew Wild <mwild1@gmail.com> parents: 4075 diff changeset	31
3644 22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	32	local stores_available = multitable.new();
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	33
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	34	function initialize_host(host)
3849 34981acbd5d5 storagemanager: Fixed a nil global access. Waqas Hussain <waqas20@gmail.com> parents: 3790 diff changeset	35	local host_session = hosts[host];
3644 22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	36	host_session.events.add_handler("item-added/data-driver", function (event)
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	37	local item = event.item;
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	38	stores_available:set(host, item.name, item);
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	39	end);
3401 2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	40
3644 22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	41	host_session.events.add_handler("item-removed/data-driver", function (event)
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	42	local item = event.item;
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	43	stores_available:set(host, item.name, nil);
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	44	end);
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	45	end
3850 39492ede0cf5 storagemanager: Hook "host-activated", to make sure we are notified about data drivers. Waqas Hussain <waqas20@gmail.com> parents: 3849 diff changeset	46	prosody.events.add_handler("host-activated", initialize_host, 101);
3644 22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	47
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	48	local function load_driver(host, driver_name)
4085 7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: 4077 diff changeset	49	if driver_name == "null" then
7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: 4077 diff changeset	50	return null_storage_provider;
3644 22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	51	end
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	52	local driver = stores_available:get(host, driver_name);
3855 b77bb597bcb0 storagemanager: When we have a cached data driver, we are supposed to use it. Waqas Hussain <waqas20@gmail.com> parents: 3850 diff changeset	53	if driver then return driver; end
4085 7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: 4077 diff changeset	54	local ok, err = modulemanager.load(host, "storage_"..driver_name);
7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: 4077 diff changeset	55	if not ok then
7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: 4077 diff changeset	56	log("error", "Failed to load storage driver plugin %s on %s: %s", driver_name, host, err);
3644 22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	57	end
4085 7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: 4077 diff changeset	58	return stores_available:get(host, driver_name);
3401 2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	59	end
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	60
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	61	function open(host, store, typ)
3644 22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	62	local storage = config.get(host, "core", "storage");
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	63	local driver_name;
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	64	local option_type = type(storage);
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	65	if option_type == "string" then
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	66	driver_name = storage;
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	67	elseif option_type == "table" then
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	68	driver_name = storage[store];
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	69	end
4085 7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: 4077 diff changeset	70	if not driver_name then
7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: 4077 diff changeset	71	driver_name = config.get(host, "core", "default_storage") or "internal";
7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: 4077 diff changeset	72	end
3644 22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	73
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	74	local driver = load_driver(host, driver_name);
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	75	if not driver then
4085 7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: 4077 diff changeset	76	log("warn", "Falling back to null driver for %s storage on %s", store, host);
7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: 4077 diff changeset	77	driver_name = "null";
7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: 4077 diff changeset	78	driver = null_storage_driver;
3644 22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	79	end
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	80
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	81	local ret, err = driver:open(store, typ);
3401 2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	82	if not ret then
3644 22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	83	if err == "unsupported-store" then
4077 ba3ab4ecce34 storagemanager: Fix log message (s/internal/null/) Matthew Wild <mwild1@gmail.com> parents: 4076 diff changeset	84	log("debug", "Storage driver %s does not support store %s (%s), falling back to null driver",
3644 22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	85	driver_name, store, typ);
4076 00ce99071368 storagemanager: Add new "null" provider to get used when loading a driver or opening a store fails, instead of falling back to the default driver Matthew Wild <mwild1@gmail.com> parents: 4075 diff changeset	86	ret = null_storage_driver;
3644 22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	87	err = nil;
22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	88	end
3401 2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	89	end
3644 22fc2063b824 storagemanager: Much refactoring and renaming of options. Untested, needs storage plugin(s) to be brought into line. Matthew Wild <mwild1@gmail.com> parents: 3403 diff changeset	90	return ret, err;
3401 2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	91	end
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	92
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	93	function datamanager.load(username, host, datastore)
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	94	return open(host, datastore):get(username);
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	95	end
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	96	function datamanager.store(username, host, datastore, data)
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	97	return open(host, datastore):set(username, data);
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	98	end
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	99
2387f35db5c8 storagemanager: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	100	return _M;

author	Matthew Wild <mwild1@gmail.com>
	Fri, 07 Jan 2011 04:22:28 +0000
changeset 4085	7699cef04740
parent 4077	ba3ab4ecce34
child 4115	801725a32c96
permissions	-rw-r--r--