prosody
498293bce4bf
core/componentmanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Annotate

core/componentmanager.lua @ 1264:498293bce4bf

componentmanager: Create events object for configured hosts, and carry it over to a new component if one is registered with no events object
author Matthew Wild <mwild1@gmail.com>
date Mon, 01 Jun 2009 02:10:19 +0100
parent 1257:8c9f20d3a17f
child 1366:54b5121b6c83
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
896
2c0b9e3c11c3 0.3->0.4
Matthew Wild <mwild1@gmail.com>
parents: 847
diff changeset
1 -- Prosody IM v0.4
760
90ce865eebd8 Update copyright notices for 2009
Matthew Wild <mwild1@gmail.com>
parents: 759
diff changeset
2 -- Copyright (C) 2008-2009 Matthew Wild
90ce865eebd8 Update copyright notices for 2009
Matthew Wild <mwild1@gmail.com>
parents: 759
diff changeset
3 -- Copyright (C) 2008-2009 Waqas Hussain
519
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 270
diff changeset
4 --
758
b1885732e979 GPL->MIT!
Matthew Wild <mwild1@gmail.com>
parents: 751
diff changeset
5 -- This project is MIT/X11 licensed. Please see the
b1885732e979 GPL->MIT!
Matthew Wild <mwild1@gmail.com>
parents: 751
diff changeset
6 -- COPYING file in the source package for more information.
519
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 270
diff changeset
7 --
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 270
diff changeset
8
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 270
diff changeset
9
847
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
10
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
11
610
d98106902f74 Enable dialback for components
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
12 local log = require "util.logger".init("componentmanager");
751
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
13 local configmanager = require "core.configmanager";
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
14 local eventmanager = require "core.eventmanager";
847
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
15 local modulemanager = require "core.modulemanager";
985
2ecd38c73b50 componentmanager: Use core_route_stanza to reply in the default component
Matthew Wild <mwild1@gmail.com>
parents: 984
diff changeset
16 local core_route_stanza = core_route_stanza;
847
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
17 local jid_split = require "util.jid".split;
1188
fa48e69c4786 core: hosts[*].events
Waqas Hussain <waqas20@gmail.com>
parents: 1177
diff changeset
18 local events_new = require "util.events".new;
982
dbbeb73952e6 componentmanager: Improve default component stanza handler
Matthew Wild <mwild1@gmail.com>
parents: 970
diff changeset
19 local st = require "util.stanza";
751
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
20 local hosts = hosts;
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
21
847
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
22 local pairs, type, tostring = pairs, type, tostring;
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
23
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
24 local components = {};
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
25
939
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
26 local disco_items = require "util.multitable".new();
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
27 local NULL = {};
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
28 require "core.discomanager".addDiscoItemsHandler("*host", function(reply, to, from, node)
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
29 if #node == 0 and hosts[to] then
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
30 for jid in pairs(disco_items:get(to) or NULL) do
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
31 reply:tag("item", {jid = jid}):up();
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
32 end
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
33 return true;
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
34 end
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
35 end);
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
36
986
ebd94ad97b75 componentmanager: Set core_route_stanza after stanza_router is loaded
Matthew Wild <mwild1@gmail.com>
parents: 985
diff changeset
37 require "core.eventmanager".add_event_hook("server-starting", function () core_route_stanza = _G.core_route_stanza; end);
939
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
38
847
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
39 module "componentmanager"
751
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
40
961
b48ed2149d0a componentmanager: Reply with service-unavailable for unconnected components
Matthew Wild <mwild1@gmail.com>
parents: 945
diff changeset
41 local function default_component_handler(origin, stanza)
982
dbbeb73952e6 componentmanager: Improve default component stanza handler
Matthew Wild <mwild1@gmail.com>
parents: 970
diff changeset
42 log("warn", "Stanza being handled by default component, bouncing error");
dbbeb73952e6 componentmanager: Improve default component stanza handler
Matthew Wild <mwild1@gmail.com>
parents: 970
diff changeset
43 if stanza.attr.type ~= "error" then
985
2ecd38c73b50 componentmanager: Use core_route_stanza to reply in the default component
Matthew Wild <mwild1@gmail.com>
parents: 984
diff changeset
44 core_route_stanza(nil, st.error_reply(stanza, "wait", "service-unavailable", "Component unavailable"));
982
dbbeb73952e6 componentmanager: Improve default component stanza handler
Matthew Wild <mwild1@gmail.com>
parents: 970
diff changeset
45 end
961
b48ed2149d0a componentmanager: Reply with service-unavailable for unconnected components
Matthew Wild <mwild1@gmail.com>
parents: 945
diff changeset
46 end
b48ed2149d0a componentmanager: Reply with service-unavailable for unconnected components
Matthew Wild <mwild1@gmail.com>
parents: 945
diff changeset
47
1096
266ef0c6b1d0 componentmanager: Reduce log output at startup to 'debug'
Matthew Wild <mwild1@gmail.com>
parents: 1064
diff changeset
48 local components_loaded_once;
751
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
49 function load_enabled_components(config)
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
50 local defined_hosts = config or configmanager.getconfig();
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
51
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
52 for host, host_config in pairs(defined_hosts) do
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
53 if host ~= "*" and ((host_config.core.enabled == nil or host_config.core.enabled) and type(host_config.core.component_module) == "string") then
1264
498293bce4bf componentmanager: Create events object for configured hosts, and carry it over to a new component if one is registered with no events object
Matthew Wild <mwild1@gmail.com>
parents: 1257
diff changeset
54 hosts[host] = { type = "component", host = host, connected = false, s2sout = {}, events = events_new() };
961
b48ed2149d0a componentmanager: Reply with service-unavailable for unconnected components
Matthew Wild <mwild1@gmail.com>
parents: 945
diff changeset
55 components[host] = default_component_handler;
751
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
56 local ok, err = modulemanager.load(host, host_config.core.component_module);
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
57 if not ok then
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
58 log("error", "Error loading %s component %s: %s", tostring(host_config.core.component_module), tostring(host), tostring(err));
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
59 else
1096
266ef0c6b1d0 componentmanager: Reduce log output at startup to 'debug'
Matthew Wild <mwild1@gmail.com>
parents: 1064
diff changeset
60 log("debug", "Activated %s component: %s", host_config.core.component_module, host);
751
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
61 end
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
62 end
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
63 end
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
64 end
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
65
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
66 eventmanager.add_event_hook("server-starting", load_enabled_components);
847
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
67
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
68 function handle_stanza(origin, stanza)
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
69 local node, host = jid_split(stanza.attr.to);
638
1915c64c9436 Changed order of checking for component hosts to check the full and bare JIDs before the hostname
Waqas Hussain <waqas20@gmail.com>
parents: 615
diff changeset
70 local component = nil;
1177
97ecfcec2d71 componentmanager: Don't error on stanzas to bare component JID
Matthew Wild <mwild1@gmail.com>
parents: 1168
diff changeset
71 if host then
97ecfcec2d71 componentmanager: Don't error on stanzas to bare component JID
Matthew Wild <mwild1@gmail.com>
parents: 1168
diff changeset
72 if node then component = components[node.."@"..host]; end -- hack to allow hooking node@server
97ecfcec2d71 componentmanager: Don't error on stanzas to bare component JID
Matthew Wild <mwild1@gmail.com>
parents: 1168
diff changeset
73 if not component then component = components[host]; end
97ecfcec2d71 componentmanager: Don't error on stanzas to bare component JID
Matthew Wild <mwild1@gmail.com>
parents: 1168
diff changeset
74 end
847
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
75 if component then
983
460429a59c83 componentmanager: Small logging fix
Matthew Wild <mwild1@gmail.com>
parents: 982
diff changeset
76 log("debug", "%s stanza being handled by component: %s", stanza.name, host);
847
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
77 component(origin, stanza, hosts[host]);
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
78 else
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
79 log("error", "Component manager recieved a stanza for a non-existing component: " .. stanza.attr.to);
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
80 end
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
81 end
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
82
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
83 function create_component(host, component)
970
5516f9e66482 sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents: 961
diff changeset
84 -- TODO check for host well-formedness
1188
fa48e69c4786 core: hosts[*].events
Waqas Hussain <waqas20@gmail.com>
parents: 1177
diff changeset
85 return { type = "component", host = host, connected = true, s2sout = {}, events = events_new() };
847
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
86 end
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
87
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
88 function register_component(host, component, session)
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
89 if not hosts[host] or (hosts[host].type == 'component' and not hosts[host].connected) then
1264
498293bce4bf componentmanager: Create events object for configured hosts, and carry it over to a new component if one is registered with no events object
Matthew Wild <mwild1@gmail.com>
parents: 1257
diff changeset
90 local old_events = hosts[host] and hosts[host].events;
498293bce4bf componentmanager: Create events object for configured hosts, and carry it over to a new component if one is registered with no events object
Matthew Wild <mwild1@gmail.com>
parents: 1257
diff changeset
91
847
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
92 components[host] = component;
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
93 hosts[host] = session or create_component(host, component);
1257
8c9f20d3a17f componentmanager: Add events object to registered components if they don't already have one
Matthew Wild <mwild1@gmail.com>
parents: 1188
diff changeset
94
8c9f20d3a17f componentmanager: Add events object to registered components if they don't already have one
Matthew Wild <mwild1@gmail.com>
parents: 1188
diff changeset
95 -- Add events object if not already one
8c9f20d3a17f componentmanager: Add events object to registered components if they don't already have one
Matthew Wild <mwild1@gmail.com>
parents: 1188
diff changeset
96 if not hosts[host].events then
1264
498293bce4bf componentmanager: Create events object for configured hosts, and carry it over to a new component if one is registered with no events object
Matthew Wild <mwild1@gmail.com>
parents: 1257
diff changeset
97 hosts[host].events = old_events or events_new();
1257
8c9f20d3a17f componentmanager: Add events object to registered components if they don't already have one
Matthew Wild <mwild1@gmail.com>
parents: 1188
diff changeset
98 end
8c9f20d3a17f componentmanager: Add events object to registered components if they don't already have one
Matthew Wild <mwild1@gmail.com>
parents: 1188
diff changeset
99
939
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
100 -- add to disco_items
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
101 if not(host:find("@", 1, true) or host:find("/", 1, true)) and host:find(".", 1, true) then
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
102 disco_items:set(host:sub(host:find(".", 1, true)+1), host, true);
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
103 end
610
d98106902f74 Enable dialback for components
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
104 -- FIXME only load for a.b.c if b.c has dialback, and/or check in config
847
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
105 modulemanager.load(host, "dialback");
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
106 log("debug", "component added: "..host);
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
107 return session or hosts[host];
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
108 else
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
109 log("error", "Attempt to set component for existing host: "..host);
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
110 end
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
111 end
673
c9bc58e84e96 componentmanager: Added support for component deregistering
Waqas Hussain <waqas20@gmail.com>
parents: 638
diff changeset
112
703
f9909efed20c componentmanager: Removed unneeded parameter from componentmanager.deregister_component
Waqas Hussain <waqas20@gmail.com>
parents: 673
diff changeset
113 function deregister_component(host)
673
c9bc58e84e96 componentmanager: Added support for component deregistering
Waqas Hussain <waqas20@gmail.com>
parents: 638
diff changeset
114 if components[host] then
751
7c22619fdb19 componentmanager: Add support for loading components defined in the config
Matthew Wild <mwild1@gmail.com>
parents: 703
diff changeset
115 modulemanager.unload(host, "dialback");
1064
3e945c3938ad core.componentmanager: Really fix marking components as disconnected when unregistered
Matthew Wild <mwild1@gmail.com>
parents: 1004
diff changeset
116 hosts[host].connected = nil;
984
9acc1c2ceb2c componentmanager: Restore default component when unregistering
Matthew Wild <mwild1@gmail.com>
parents: 983
diff changeset
117 local host_config = configmanager.getconfig()[host];
9acc1c2ceb2c componentmanager: Restore default component when unregistering
Matthew Wild <mwild1@gmail.com>
parents: 983
diff changeset
118 if host_config and ((host_config.core.enabled == nil or host_config.core.enabled) and type(host_config.core.component_module) == "string") then
961
b48ed2149d0a componentmanager: Reply with service-unavailable for unconnected components
Matthew Wild <mwild1@gmail.com>
parents: 945
diff changeset
119 -- Set default handler
984
9acc1c2ceb2c componentmanager: Restore default component when unregistering
Matthew Wild <mwild1@gmail.com>
parents: 983
diff changeset
120 components[host] = default_component_handler;
961
b48ed2149d0a componentmanager: Reply with service-unavailable for unconnected components
Matthew Wild <mwild1@gmail.com>
parents: 945
diff changeset
121 else
b48ed2149d0a componentmanager: Reply with service-unavailable for unconnected components
Matthew Wild <mwild1@gmail.com>
parents: 945
diff changeset
122 -- Component not in config, or disabled, remove
b48ed2149d0a componentmanager: Reply with service-unavailable for unconnected components
Matthew Wild <mwild1@gmail.com>
parents: 945
diff changeset
123 hosts[host] = nil;
984
9acc1c2ceb2c componentmanager: Restore default component when unregistering
Matthew Wild <mwild1@gmail.com>
parents: 983
diff changeset
124 components[host] = nil;
961
b48ed2149d0a componentmanager: Reply with service-unavailable for unconnected components
Matthew Wild <mwild1@gmail.com>
parents: 945
diff changeset
125 end
939
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
126 -- remove from disco_items
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
127 if not(host:find("@", 1, true) or host:find("/", 1, true)) and host:find(".", 1, true) then
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
128 disco_items:remove(host:sub(host:find(".", 1, true)+1), host);
b832f786af62 Added: componentmanager: Automatically add component.host.name to the disco items list of host.name
Waqas Hussain <waqas20@gmail.com>
parents: 896
diff changeset
129 end
673
c9bc58e84e96 componentmanager: Added support for component deregistering
Waqas Hussain <waqas20@gmail.com>
parents: 638
diff changeset
130 log("debug", "component removed: "..host);
c9bc58e84e96 componentmanager: Added support for component deregistering
Waqas Hussain <waqas20@gmail.com>
parents: 638
diff changeset
131 return true;
c9bc58e84e96 componentmanager: Added support for component deregistering
Waqas Hussain <waqas20@gmail.com>
parents: 638
diff changeset
132 else
c9bc58e84e96 componentmanager: Added support for component deregistering
Waqas Hussain <waqas20@gmail.com>
parents: 638
diff changeset
133 log("error", "Attempt to remove component for non-existing host: "..host);
c9bc58e84e96 componentmanager: Added support for component deregistering
Waqas Hussain <waqas20@gmail.com>
parents: 638
diff changeset
134 end
c9bc58e84e96 componentmanager: Added support for component deregistering
Waqas Hussain <waqas20@gmail.com>
parents: 638
diff changeset
135 end
847
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
136
961
b48ed2149d0a componentmanager: Reply with service-unavailable for unconnected components
Matthew Wild <mwild1@gmail.com>
parents: 945
diff changeset
137 function set_component_handler(host, handler)
b48ed2149d0a componentmanager: Reply with service-unavailable for unconnected components
Matthew Wild <mwild1@gmail.com>
parents: 945
diff changeset
138 components[host] = handler;
b48ed2149d0a componentmanager: Reply with service-unavailable for unconnected components
Matthew Wild <mwild1@gmail.com>
parents: 945
diff changeset
139 end
b48ed2149d0a componentmanager: Reply with service-unavailable for unconnected components
Matthew Wild <mwild1@gmail.com>
parents: 945
diff changeset
140
847
2d424936723c core.componentmanager: Refactor a little to make XEP-0114 plugin a little simpler
Matthew Wild <mwild1@gmail.com>
parents: 777
diff changeset
141 return _M;