Software `/` code `/` prosody

Annotate

core/modulemanager.lua @ 573:f6555ebf84ec

Move module loading to modulemanager

author	Matthew Wild <mwild1@gmail.com>
date	Sat, 06 Dec 2008 04:03:33 +0000
parent	569:5216efe6088b
child	577:22f54a04471f
child	578:5879264e28e2

rev	line source
519 cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	1 -- Prosody IM v0.1
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	2 -- Copyright (C) 2008 Matthew Wild
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	3 -- Copyright (C) 2008 Waqas Hussain
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	4 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	5 -- This program is free software; you can redistribute it and/or
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	6 -- modify it under the terms of the GNU General Public License
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	7 -- as published by the Free Software Foundation; either version 2
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	8 -- of the License, or (at your option) any later version.
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	9 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	10 -- This program is distributed in the hope that it will be useful,
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	11 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	12 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	13 -- GNU General Public License for more details.
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	14 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	15 -- You should have received a copy of the GNU General Public License
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	16 -- along with this program; if not, write to the Free Software
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	17 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	18 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	19
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	20
30 bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	21
467 66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths. Matthew Wild <mwild1@gmail.com> parents: 439 diff changeset	22 local plugin_dir = CFG_PLUGINDIR or "./plugins/";
438 193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	23
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	24 local logger = require "util.logger";
540 ec03f6968fa8 Added function add_feature to modules API (for adding disco features) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	25 local log = logger.init("modulemanager");
ec03f6968fa8 Added function add_feature to modules API (for adding disco features) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	26 local addDiscoInfoHandler = require "core.discomanager".addDiscoInfoHandler;
569 5216efe6088b Add hostmanager, and eventmanager Matthew Wild <mwild1@gmail.com> parents: 540 diff changeset	27 local eventmanager = require "core.eventmanager";
573 f6555ebf84ec Move module loading to modulemanager Matthew Wild <mwild1@gmail.com> parents: 569 diff changeset	28 local config = require "core.configmanager";
569 5216efe6088b Add hostmanager, and eventmanager Matthew Wild <mwild1@gmail.com> parents: 540 diff changeset	29
30 bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	30
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	31 local loadfile, pcall = loadfile, pcall;
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	32 local setmetatable, setfenv, getfenv = setmetatable, setfenv, getfenv;
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	33 local pairs, ipairs = pairs, ipairs;
39 89877d61ac51 Add support for arbitrary events and event hooks Matthew Wild <mwild1@gmail.com> parents: 38 diff changeset	34 local t_insert = table.insert;
30 bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	35 local type = type;
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	36
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	37 local tostring, print = tostring, print;
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	38
467 66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths. Matthew Wild <mwild1@gmail.com> parents: 439 diff changeset	39 -- We need this to let modules access the real global namespace
30 bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	40 local _G = _G;
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	41
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	42 module "modulemanager"
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	43
438 193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	44 local api = {}; -- Module API container
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	45
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	46 local modulemap = {};
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	47
30 bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	48 local handler_info = {};
438 193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	49 local stanza_handlers = {};
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	50
30 bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	51 local modulehelpers = setmetatable({}, { __index = _G });
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	52
573 f6555ebf84ec Move module loading to modulemanager Matthew Wild <mwild1@gmail.com> parents: 569 diff changeset	53 -- Load modules when a host is activated
f6555ebf84ec Move module loading to modulemanager Matthew Wild <mwild1@gmail.com> parents: 569 diff changeset	54 function load_modules_for_host(host)
f6555ebf84ec Move module loading to modulemanager Matthew Wild <mwild1@gmail.com> parents: 569 diff changeset	55 local modules_enabled = config.get(host, "core", "modules_enabled");
f6555ebf84ec Move module loading to modulemanager Matthew Wild <mwild1@gmail.com> parents: 569 diff changeset	56 if modules_enabled then
f6555ebf84ec Move module loading to modulemanager Matthew Wild <mwild1@gmail.com> parents: 569 diff changeset	57 for _, module in pairs(modules_enabled) do
f6555ebf84ec Move module loading to modulemanager Matthew Wild <mwild1@gmail.com> parents: 569 diff changeset	58 load(host, module);
f6555ebf84ec Move module loading to modulemanager Matthew Wild <mwild1@gmail.com> parents: 569 diff changeset	59 end
f6555ebf84ec Move module loading to modulemanager Matthew Wild <mwild1@gmail.com> parents: 569 diff changeset	60 end
f6555ebf84ec Move module loading to modulemanager Matthew Wild <mwild1@gmail.com> parents: 569 diff changeset	61 end
f6555ebf84ec Move module loading to modulemanager Matthew Wild <mwild1@gmail.com> parents: 569 diff changeset	62 eventmanager.add_event_hook("host-activated", load_modules_for_host);
f6555ebf84ec Move module loading to modulemanager Matthew Wild <mwild1@gmail.com> parents: 569 diff changeset	63 --
30 bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	64
438 193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	65 function load(host, module_name, config)
439 6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	66 if not (host and module_name) then
6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	67 return nil, "insufficient-parameters";
6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	68 end
467 66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths. Matthew Wild <mwild1@gmail.com> parents: 439 diff changeset	69 local mod, err = loadfile(plugin_dir.."mod_"..module_name..".lua");
30 bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	70 if not mod then
438 193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	71 log("error", "Unable to load module '%s': %s", module_name or "nil", err or "nil");
229 01bd24ea488d We now fail if modules fail to load at startup. Waqas Hussain <waqas20@gmail.com> parents: 218 diff changeset	72 return nil, err;
30 bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	73 end
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	74
438 193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	75 if not modulemap[host] then
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	76 modulemap[host] = {};
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	77 stanza_handlers[host] = {};
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	78 elseif modulemap[host][module_name] then
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	79 log("warn", "%s is already loaded for %s, so not loading again", module_name, host);
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	80 return nil, "module-already-loaded";
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	81 end
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	82
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	83 local _log = logger.init(host..":"..module_name);
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	84 local api_instance = setmetatable({ name = module_name, host = host, config = config, _log = _log, log = function (self, ...) return _log(...); end }, { __index = api });
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	85
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	86 local pluginenv = setmetatable({ module = api_instance }, { __index = _G });
30 bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	87
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	88 setfenv(mod, pluginenv);
438 193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	89
30 bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	90 local success, ret = pcall(mod);
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	91 if not success then
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	92 log("error", "Error initialising module '%s': %s", name or "nil", ret or "nil");
391 79bd7a3e906c Typo prevented modulemanager.load() from returning the error if load failed. Matthew Wild <mwild1@gmail.com> parents: 385 diff changeset	93 return nil, ret;
30 bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	94 end
438 193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	95
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	96 modulemap[host][module_name] = mod;
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	97
229 01bd24ea488d We now fail if modules fail to load at startup. Waqas Hussain <waqas20@gmail.com> parents: 218 diff changeset	98 return true;
30 bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	99 end
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	100
439 6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	101 function is_loaded(host, name)
6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	102 return modulemap[host] and modulemap[host][name] and true;
6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	103 end
6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	104
6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	105 function unload(host, name, ...)
6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	106 local mod = modulemap[host] and modulemap[host][name];
6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	107 if not mod then return nil, "module-not-loaded"; end
6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	108
6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	109 if type(mod.unload) == "function" then
6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	110 local ok, err = pcall(mod.unload, ...)
6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	111 if (not ok) and err then
6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	112 log("warn", "Non-fatal error unloading module '%s' from '%s': %s", name, host, err);
6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	113 end
6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	114 end
6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	115
6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	116 end
6608ad3a72f3 is_loaded() and incomplete unload() for modules Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	117
438 193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	118 function handle_stanza(host, origin, stanza)
38 3fdfd6e0cb4e SASL! Matthew Wild <mwild1@gmail.com> parents: 30 diff changeset	119 local name, xmlns, origin_type = stanza.name, stanza.attr.xmlns, origin.type;
30 bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	120
438 193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	121 local handlers = stanza_handlers[host];
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	122 if not handlers then
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	123 log("warn", "No handlers for %s", host);
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	124 return false;
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	125 end
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	126
38 3fdfd6e0cb4e SASL! Matthew Wild <mwild1@gmail.com> parents: 30 diff changeset	127 if name == "iq" and xmlns == "jabber:client" and handlers[origin_type] then
30 bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	128 local child = stanza.tags[1];
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	129 if child then
300 0ebf2ef5124e If iq child element has no xmlns, use parent's Matthew Wild <mwild1@gmail.com> parents: 229 diff changeset	130 local xmlns = child.attr.xmlns or xmlns;
0ebf2ef5124e If iq child element has no xmlns, use parent's Matthew Wild <mwild1@gmail.com> parents: 229 diff changeset	131 log("debug", "Stanza of type %s from %s has xmlns: %s", name, origin_type, xmlns);
398 79f84fc3e9ae Check to prevent error on IQs from completely unhandled origins Waqas Hussain <waqas20@gmail.com> parents: 391 diff changeset	132 local handler = handlers[origin_type][name] and handlers[origin_type][name][xmlns];
79f84fc3e9ae Check to prevent error on IQs from completely unhandled origins Waqas Hussain <waqas20@gmail.com> parents: 391 diff changeset	133 if handler then
30 bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	134 log("debug", "Passing stanza to mod_%s", handler_info[handler].name);
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	135 return handler(origin, stanza) or true;
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	136 end
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	137 end
38 3fdfd6e0cb4e SASL! Matthew Wild <mwild1@gmail.com> parents: 30 diff changeset	138 elseif handlers[origin_type] then
3fdfd6e0cb4e SASL! Matthew Wild <mwild1@gmail.com> parents: 30 diff changeset	139 local handler = handlers[origin_type][name];
391 79bd7a3e906c Typo prevented modulemanager.load() from returning the error if load failed. Matthew Wild <mwild1@gmail.com> parents: 385 diff changeset	140 if handler then
47 33ed4c6ac249 Fix stanza handlers to use xmlns also for matching Matthew Wild <mwild1@gmail.com> parents: 42 diff changeset	141 handler = handler[xmlns];
33ed4c6ac249 Fix stanza handlers to use xmlns also for matching Matthew Wild <mwild1@gmail.com> parents: 42 diff changeset	142 if handler then
33ed4c6ac249 Fix stanza handlers to use xmlns also for matching Matthew Wild <mwild1@gmail.com> parents: 42 diff changeset	143 log("debug", "Passing stanza to mod_%s", handler_info[handler].name);
33ed4c6ac249 Fix stanza handlers to use xmlns also for matching Matthew Wild <mwild1@gmail.com> parents: 42 diff changeset	144 return handler(origin, stanza) or true;
33ed4c6ac249 Fix stanza handlers to use xmlns also for matching Matthew Wild <mwild1@gmail.com> parents: 42 diff changeset	145 end
38 3fdfd6e0cb4e SASL! Matthew Wild <mwild1@gmail.com> parents: 30 diff changeset	146 end
30 bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	147 end
47 33ed4c6ac249 Fix stanza handlers to use xmlns also for matching Matthew Wild <mwild1@gmail.com> parents: 42 diff changeset	148 log("debug", "Stanza unhandled by any modules, xmlns: %s", stanza.attr.xmlns);
30 bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	149 return false; -- we didn't handle it
bcf539295f2d Huge commit to: Matthew Wild <mwild1@gmail.com> parents: diff changeset	150 end
39 89877d61ac51 Add support for arbitrary events and event hooks Matthew Wild <mwild1@gmail.com> parents: 38 diff changeset	151
438 193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	152 ----- API functions exposed to modules -----------
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	153 -- Must all be in api.*
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	154
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	155 -- Returns the name of the current module
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	156 function api:get_name()
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	157 return self.name;
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	158 end
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	159
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	160 -- Returns the host that the current module is serving
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	161 function api:get_host()
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	162 return self.host;
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	163 end
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	164
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	165
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	166 local function _add_iq_handler(module, origin_type, xmlns, handler)
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	167 local handlers = stanza_handlers[module.host];
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	168 handlers[origin_type] = handlers[origin_type] or {};
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	169 handlers[origin_type].iq = handlers[origin_type].iq or {};
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	170 if not handlers[origin_type].iq[xmlns] then
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	171 handlers[origin_type].iq[xmlns]= handler;
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	172 handler_info[handler] = module;
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	173 module:log("debug", "I now handle tag 'iq' [%s] with payload namespace '%s'", origin_type, xmlns);
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	174 else
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	175 module:log("warn", "I wanted to handle tag 'iq' [%s] with payload namespace '%s' but mod_%s already handles that", origin_type, xmlns, handler_info[handlers[origin_type].iq[xmlns]].name);
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	176 end
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	177 end
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	178
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	179 function api:add_iq_handler(origin_type, xmlns, handler)
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	180 if not (origin_type and handler and xmlns) then return false; end
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	181 if type(origin_type) == "table" then
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	182 for _, origin_type in ipairs(origin_type) do
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	183 _add_iq_handler(self, origin_type, xmlns, handler);
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	184 end
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	185 return;
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	186 end
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	187 _add_iq_handler(self, origin_type, xmlns, handler);
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	188 end
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	189
540 ec03f6968fa8 Added function add_feature to modules API (for adding disco features) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	190 function api:add_feature(xmlns)
ec03f6968fa8 Added function add_feature to modules API (for adding disco features) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	191 addDiscoInfoHandler(self.host, function(reply, to, from, node)
ec03f6968fa8 Added function add_feature to modules API (for adding disco features) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	192 if #node == 0 then
ec03f6968fa8 Added function add_feature to modules API (for adding disco features) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	193 reply:tag("feature", {var = xmlns}):up();
ec03f6968fa8 Added function add_feature to modules API (for adding disco features) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	194 return true;
ec03f6968fa8 Added function add_feature to modules API (for adding disco features) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	195 end
ec03f6968fa8 Added function add_feature to modules API (for adding disco features) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	196 end);
ec03f6968fa8 Added function add_feature to modules API (for adding disco features) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	197 end
ec03f6968fa8 Added function add_feature to modules API (for adding disco features) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	198
569 5216efe6088b Add hostmanager, and eventmanager Matthew Wild <mwild1@gmail.com> parents: 540 diff changeset	199 api.add_event_hook = eventmanager.add_event_hook;
438 193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	200
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	201 local function _add_handler(module, origin_type, tag, xmlns, handler)
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	202 local handlers = stanza_handlers[module.host];
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	203 handlers[origin_type] = handlers[origin_type] or {};
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	204 if not handlers[origin_type][tag] then
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	205 handlers[origin_type][tag] = handlers[origin_type][tag] or {};
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	206 handlers[origin_type][tag][xmlns]= handler;
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	207 handler_info[handler] = module;
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	208 module:log("debug", "I now handle tag '%s' [%s] with xmlns '%s'", tag, origin_type, xmlns);
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	209 elseif handler_info[handlers[origin_type][tag]] then
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	210 log("warning", "I wanted to handle tag '%s' [%s] but mod_%s already handles that", tag, origin_type, handler_info[handlers[origin_type][tag]].module.name);
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	211 end
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	212 end
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	213
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	214 function api:add_handler(origin_type, tag, xmlns, handler)
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	215 if not (origin_type and tag and xmlns and handler) then return false; end
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	216 if type(origin_type) == "table" then
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	217 for _, origin_type in ipairs(origin_type) do
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	218 _add_handler(self, origin_type, tag, xmlns, handler);
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	219 end
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	220 return;
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	221 end
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	222 _add_handler(self, origin_type, tag, xmlns, handler);
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	223 end
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	224
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	225 --------------------------------------------------------------------
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store. Matthew Wild <mwild1@gmail.com> parents: 400 diff changeset	226
39 89877d61ac51 Add support for arbitrary events and event hooks Matthew Wild <mwild1@gmail.com> parents: 38 diff changeset	227 return _M;

prosody

f6555ebf84ec

core/modulemanager.lua

Software / code / prosody

Annotate

core/modulemanager.lua @ 573:f6555ebf84ec

Software `/` code `/` prosody