Software /
code /
prosody
Annotate
core/hostmanager.lua @ 5236:8d116a0cdacd
mod_http_files: Cache data read from disk in a weak table
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Tue, 11 Dec 2012 23:02:06 +0100 |
parent | 5123:7c5c86fa552e |
child | 5347:32e25358c3c2 |
rev | line source |
---|---|
1522
569d58d21612
Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents:
1467
diff
changeset
|
1 -- Prosody IM |
2923
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2877
diff
changeset
|
2 -- Copyright (C) 2008-2010 Matthew Wild |
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2877
diff
changeset
|
3 -- Copyright (C) 2008-2010 Waqas Hussain |
1522
569d58d21612
Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents:
1467
diff
changeset
|
4 -- |
569d58d21612
Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents:
1467
diff
changeset
|
5 -- This project is MIT/X11 licensed. Please see the |
569d58d21612
Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents:
1467
diff
changeset
|
6 -- COPYING file in the source package for more information. |
569d58d21612
Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents:
1467
diff
changeset
|
7 -- |
569d58d21612
Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents:
1467
diff
changeset
|
8 |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
9 local configmanager = require "core.configmanager"; |
1975
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
10 local modulemanager = require "core.modulemanager"; |
1188 | 11 local events_new = require "util.events".new; |
3599
adc0b4df6fdd
hostmanager: Added function get_children(host) which copies componentmanager.get_children(host).
Waqas Hussain <waqas20@gmail.com>
parents:
3597
diff
changeset
|
12 local disco_items = require "util.multitable".new(); |
adc0b4df6fdd
hostmanager: Added function get_children(host) which copies componentmanager.get_children(host).
Waqas Hussain <waqas20@gmail.com>
parents:
3597
diff
changeset
|
13 local NULL = {}; |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
14 |
4502
dd1eaecc11f9
hostmanager: Import jid_split (thanks chris)
Matthew Wild <mwild1@gmail.com>
parents:
4460
diff
changeset
|
15 local jid_split = require "util.jid".split; |
2420
6ccd36a95a81
s2smanager, hostmanager: Make dialback secrets per-host
Matthew Wild <mwild1@gmail.com>
parents:
2321
diff
changeset
|
16 local uuid_gen = require "util.uuid".generate; |
6ccd36a95a81
s2smanager, hostmanager: Make dialback secrets per-host
Matthew Wild <mwild1@gmail.com>
parents:
2321
diff
changeset
|
17 |
3434
428f13c098d5
hostmanager: Remove dependency on eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
2984
diff
changeset
|
18 local log = require "util.logger".init("hostmanager"); |
428f13c098d5
hostmanager: Remove dependency on eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
2984
diff
changeset
|
19 |
428f13c098d5
hostmanager: Remove dependency on eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
2984
diff
changeset
|
20 local hosts = hosts; |
428f13c098d5
hostmanager: Remove dependency on eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
2984
diff
changeset
|
21 local prosody_events = prosody.events; |
1975
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
22 if not _G.prosody.incoming_s2s then |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
23 require "core.s2smanager"; |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
24 end |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
25 local incoming_s2s = _G.prosody.incoming_s2s; |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
26 |
4748
1099ff8d9f76
hostmanager: Remove import of unused setmetatable
Matthew Wild <mwild1@gmail.com>
parents:
4732
diff
changeset
|
27 local pairs, select = pairs, select; |
3717
135128fdf565
hostmanager: Improved error handling.
Waqas Hussain <waqas20@gmail.com>
parents:
3716
diff
changeset
|
28 local tostring, type = tostring, type; |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
29 |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
30 module "hostmanager" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
31 |
1095
cad4205f4925
hostmanager: Reduce log output at startup to 'debug'
Matthew Wild <mwild1@gmail.com>
parents:
749
diff
changeset
|
32 local hosts_loaded_once; |
cad4205f4925
hostmanager: Reduce log output at startup to 'debug'
Matthew Wild <mwild1@gmail.com>
parents:
749
diff
changeset
|
33 |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
34 local function load_enabled_hosts(config) |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
35 local defined_hosts = config or configmanager.getconfig(); |
2855
66a1aa0bedc0
hostmanager: Log an error if no hosts are defined
Matthew Wild <mwild1@gmail.com>
parents:
1980
diff
changeset
|
36 local activated_any_host; |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
37 |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
38 for host, host_config in pairs(defined_hosts) do |
3597
8090880f0e18
hostmanager, componentmanager: hostmanager now handles component initialization at server start, not componentmanager.
Waqas Hussain <waqas20@gmail.com>
parents:
3594
diff
changeset
|
39 if host ~= "*" and host_config.core.enabled ~= false then |
8090880f0e18
hostmanager, componentmanager: hostmanager now handles component initialization at server start, not componentmanager.
Waqas Hussain <waqas20@gmail.com>
parents:
3594
diff
changeset
|
40 if not host_config.core.component_module then |
8090880f0e18
hostmanager, componentmanager: hostmanager now handles component initialization at server start, not componentmanager.
Waqas Hussain <waqas20@gmail.com>
parents:
3594
diff
changeset
|
41 activated_any_host = true; |
8090880f0e18
hostmanager, componentmanager: hostmanager now handles component initialization at server start, not componentmanager.
Waqas Hussain <waqas20@gmail.com>
parents:
3594
diff
changeset
|
42 end |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
43 activate(host, host_config); |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
44 end |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
45 end |
2855
66a1aa0bedc0
hostmanager: Log an error if no hosts are defined
Matthew Wild <mwild1@gmail.com>
parents:
1980
diff
changeset
|
46 |
66a1aa0bedc0
hostmanager: Log an error if no hosts are defined
Matthew Wild <mwild1@gmail.com>
parents:
1980
diff
changeset
|
47 if not activated_any_host then |
2981
15a7afea7f59
hostmanager: Re-word log messages in line with config changes
Matthew Wild <mwild1@gmail.com>
parents:
2923
diff
changeset
|
48 log("error", "No active VirtualHost entries in the config file. This may cause unexpected behaviour as no modules will be loaded."); |
2855
66a1aa0bedc0
hostmanager: Log an error if no hosts are defined
Matthew Wild <mwild1@gmail.com>
parents:
1980
diff
changeset
|
49 end |
66a1aa0bedc0
hostmanager: Log an error if no hosts are defined
Matthew Wild <mwild1@gmail.com>
parents:
1980
diff
changeset
|
50 |
3434
428f13c098d5
hostmanager: Remove dependency on eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
2984
diff
changeset
|
51 prosody_events.fire_event("hosts-activated", defined_hosts); |
1095
cad4205f4925
hostmanager: Reduce log output at startup to 'debug'
Matthew Wild <mwild1@gmail.com>
parents:
749
diff
changeset
|
52 hosts_loaded_once = true; |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
53 end |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
54 |
3434
428f13c098d5
hostmanager: Remove dependency on eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
2984
diff
changeset
|
55 prosody_events.add_handler("server-starting", load_enabled_hosts); |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
56 |
4460
a813a130cede
hostmanager: Add send() method to hosts
Matthew Wild <mwild1@gmail.com>
parents:
3984
diff
changeset
|
57 local function host_send(stanza) |
a813a130cede
hostmanager: Add send() method to hosts
Matthew Wild <mwild1@gmail.com>
parents:
3984
diff
changeset
|
58 local name, type = stanza.name, stanza.attr.type; |
a813a130cede
hostmanager: Add send() method to hosts
Matthew Wild <mwild1@gmail.com>
parents:
3984
diff
changeset
|
59 if type == "error" or (name == "iq" and type == "result") then |
a813a130cede
hostmanager: Add send() method to hosts
Matthew Wild <mwild1@gmail.com>
parents:
3984
diff
changeset
|
60 local dest_host_name = select(2, jid_split(stanza.attr.to)); |
a813a130cede
hostmanager: Add send() method to hosts
Matthew Wild <mwild1@gmail.com>
parents:
3984
diff
changeset
|
61 local dest_host = hosts[dest_host_name] or { type = "unknown" }; |
a813a130cede
hostmanager: Add send() method to hosts
Matthew Wild <mwild1@gmail.com>
parents:
3984
diff
changeset
|
62 log("warn", "Unhandled response sent to %s host %s: %s", dest_host.type, dest_host_name, tostring(stanza)); |
a813a130cede
hostmanager: Add send() method to hosts
Matthew Wild <mwild1@gmail.com>
parents:
3984
diff
changeset
|
63 return; |
a813a130cede
hostmanager: Add send() method to hosts
Matthew Wild <mwild1@gmail.com>
parents:
3984
diff
changeset
|
64 end |
a813a130cede
hostmanager: Add send() method to hosts
Matthew Wild <mwild1@gmail.com>
parents:
3984
diff
changeset
|
65 core_route_stanza(nil, stanza); |
a813a130cede
hostmanager: Add send() method to hosts
Matthew Wild <mwild1@gmail.com>
parents:
3984
diff
changeset
|
66 end |
a813a130cede
hostmanager: Add send() method to hosts
Matthew Wild <mwild1@gmail.com>
parents:
3984
diff
changeset
|
67 |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
68 function activate(host, host_config) |
3717
135128fdf565
hostmanager: Improved error handling.
Waqas Hussain <waqas20@gmail.com>
parents:
3716
diff
changeset
|
69 if hosts[host] then return nil, "The host "..host.." is already activated"; end |
3715
d7574530572c
hostmanager: activate() now gets the host config from configmanager when a config isn't given.
Waqas Hussain <waqas20@gmail.com>
parents:
3601
diff
changeset
|
70 host_config = host_config or configmanager.getconfig()[host]; |
3717
135128fdf565
hostmanager: Improved error handling.
Waqas Hussain <waqas20@gmail.com>
parents:
3716
diff
changeset
|
71 if not host_config then return nil, "Couldn't find the host "..tostring(host).." defined in the current config"; end |
3594
d3b57562cd87
hostmanager: Added support for components to hostmanager.activate().
Waqas Hussain <waqas20@gmail.com>
parents:
3587
diff
changeset
|
72 local host_session = { |
d3b57562cd87
hostmanager: Added support for components to hostmanager.activate().
Waqas Hussain <waqas20@gmail.com>
parents:
3587
diff
changeset
|
73 host = host; |
d3b57562cd87
hostmanager: Added support for components to hostmanager.activate().
Waqas Hussain <waqas20@gmail.com>
parents:
3587
diff
changeset
|
74 s2sout = {}; |
d3b57562cd87
hostmanager: Added support for components to hostmanager.activate().
Waqas Hussain <waqas20@gmail.com>
parents:
3587
diff
changeset
|
75 events = events_new(); |
d3b57562cd87
hostmanager: Added support for components to hostmanager.activate().
Waqas Hussain <waqas20@gmail.com>
parents:
3587
diff
changeset
|
76 dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen(); |
4460
a813a130cede
hostmanager: Add send() method to hosts
Matthew Wild <mwild1@gmail.com>
parents:
3984
diff
changeset
|
77 send = host_send; |
5123
7c5c86fa552e
hostmanager, modulemanager: Ensure hosts[*].modules always exists.
Waqas Hussain <waqas20@gmail.com>
parents:
5081
diff
changeset
|
78 modules = {}; |
3594
d3b57562cd87
hostmanager: Added support for components to hostmanager.activate().
Waqas Hussain <waqas20@gmail.com>
parents:
3587
diff
changeset
|
79 }; |
d3b57562cd87
hostmanager: Added support for components to hostmanager.activate().
Waqas Hussain <waqas20@gmail.com>
parents:
3587
diff
changeset
|
80 if not host_config.core.component_module then -- host |
d3b57562cd87
hostmanager: Added support for components to hostmanager.activate().
Waqas Hussain <waqas20@gmail.com>
parents:
3587
diff
changeset
|
81 host_session.type = "local"; |
d3b57562cd87
hostmanager: Added support for components to hostmanager.activate().
Waqas Hussain <waqas20@gmail.com>
parents:
3587
diff
changeset
|
82 host_session.sessions = {}; |
d3b57562cd87
hostmanager: Added support for components to hostmanager.activate().
Waqas Hussain <waqas20@gmail.com>
parents:
3587
diff
changeset
|
83 else -- component |
d3b57562cd87
hostmanager: Added support for components to hostmanager.activate().
Waqas Hussain <waqas20@gmail.com>
parents:
3587
diff
changeset
|
84 host_session.type = "component"; |
d3b57562cd87
hostmanager: Added support for components to hostmanager.activate().
Waqas Hussain <waqas20@gmail.com>
parents:
3587
diff
changeset
|
85 end |
d3b57562cd87
hostmanager: Added support for components to hostmanager.activate().
Waqas Hussain <waqas20@gmail.com>
parents:
3587
diff
changeset
|
86 hosts[host] = host_session; |
3601
829e23b374cc
hostmanager: Don't include hosts with '@' or '/' in the name in the get_children(host) result.
Waqas Hussain <waqas20@gmail.com>
parents:
3599
diff
changeset
|
87 if not host:match("[@/]") then |
5081
c0c060e450be
hostmanager, mod_disco: Show optional 'name' option from the config in disco#items queries (fixes use-case in #292) (thanks diSabler, mva)
Matthew Wild <mwild1@gmail.com>
parents:
4834
diff
changeset
|
88 disco_items:set(host:match("%.(.*)") or "*", host, host_config.core.name or true); |
3601
829e23b374cc
hostmanager: Don't include hosts with '@' or '/' in the name in the get_children(host) result.
Waqas Hussain <waqas20@gmail.com>
parents:
3599
diff
changeset
|
89 end |
1614
951ed38ad64f
hostmanager: Warn when user puts port configuration under vhost section
Matthew Wild <mwild1@gmail.com>
parents:
1522
diff
changeset
|
90 for option_name in pairs(host_config.core) do |
2981
15a7afea7f59
hostmanager: Re-word log messages in line with config changes
Matthew Wild <mwild1@gmail.com>
parents:
2923
diff
changeset
|
91 if option_name:match("_ports$") or option_name:match("_interface$") then |
15a7afea7f59
hostmanager: Re-word log messages in line with config changes
Matthew Wild <mwild1@gmail.com>
parents:
2923
diff
changeset
|
92 log("warn", "%s: Option '%s' has no effect for virtual hosts - put it in the server-wide section instead", host, option_name); |
1614
951ed38ad64f
hostmanager: Warn when user puts port configuration under vhost section
Matthew Wild <mwild1@gmail.com>
parents:
1522
diff
changeset
|
93 end |
951ed38ad64f
hostmanager: Warn when user puts port configuration under vhost section
Matthew Wild <mwild1@gmail.com>
parents:
1522
diff
changeset
|
94 end |
1893
2d202336c9b6
hostmanager: Create ssl context for each host (fixes #30 for outgoing s2s connections)
Matthew Wild <mwild1@gmail.com>
parents:
1848
diff
changeset
|
95 |
1095
cad4205f4925
hostmanager: Reduce log output at startup to 'debug'
Matthew Wild <mwild1@gmail.com>
parents:
749
diff
changeset
|
96 log((hosts_loaded_once and "info") or "debug", "Activated host: %s", host); |
4732
29ff25c8bf56
hostmanager: Remove unused host_config parameter from host-activated event
Matthew Wild <mwild1@gmail.com>
parents:
4731
diff
changeset
|
97 prosody_events.fire_event("host-activated", host); |
3597
8090880f0e18
hostmanager, componentmanager: hostmanager now handles component initialization at server start, not componentmanager.
Waqas Hussain <waqas20@gmail.com>
parents:
3594
diff
changeset
|
98 return true; |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
99 end |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
100 |
1975
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
101 function deactivate(host, reason) |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
102 local host_session = hosts[host]; |
3717
135128fdf565
hostmanager: Improved error handling.
Waqas Hussain <waqas20@gmail.com>
parents:
3716
diff
changeset
|
103 if not host_session then return nil, "The host "..tostring(host).." is not activated"; end |
575
428c951d0a33
Log in hostmanager when a vhost is activated/deactivated
Matthew Wild <mwild1@gmail.com>
parents:
569
diff
changeset
|
104 log("info", "Deactivating host: %s", host); |
4730
2587e249927f
hostmanager: Convert host-deactivating event parameters to a table
Matthew Wild <mwild1@gmail.com>
parents:
4508
diff
changeset
|
105 prosody_events.fire_event("host-deactivating", { host = host, host_session = host_session, reason = reason }); |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
106 |
3717
135128fdf565
hostmanager: Improved error handling.
Waqas Hussain <waqas20@gmail.com>
parents:
3716
diff
changeset
|
107 if type(reason) ~= "table" then |
135128fdf565
hostmanager: Improved error handling.
Waqas Hussain <waqas20@gmail.com>
parents:
3716
diff
changeset
|
108 reason = { condition = "host-gone", text = tostring(reason or "This server has stopped serving "..host) }; |
135128fdf565
hostmanager: Improved error handling.
Waqas Hussain <waqas20@gmail.com>
parents:
3716
diff
changeset
|
109 end |
1975
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
110 |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
111 -- Disconnect local users, s2s connections |
4731
84596fc32b31
hostmanager: Add some TODO comments
Matthew Wild <mwild1@gmail.com>
parents:
4730
diff
changeset
|
112 -- TODO: These should move to mod_c2s and mod_s2s (how do they know they're being unloaded and not reloaded?) |
1975
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
113 if host_session.sessions then |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
114 for username, user in pairs(host_session.sessions) do |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
115 for resource, session in pairs(user.sessions) do |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
116 log("debug", "Closing connection for %s@%s/%s", username, host, resource); |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
117 session:close(reason); |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
118 end |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
119 end |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
120 end |
1975
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
121 if host_session.s2sout then |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
122 for remotehost, session in pairs(host_session.s2sout) do |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
123 if session.close then |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
124 log("debug", "Closing outgoing connection to %s", remotehost); |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
125 if session.srv_hosts then session.srv_hosts = nil; end |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
126 session:close(reason); |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
127 end |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
128 end |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
129 end |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
130 for remote_session in pairs(incoming_s2s) do |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
131 if remote_session.to_host == host then |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
132 log("debug", "Closing incoming connection from %s", remote_session.from_host or "<unknown>"); |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
133 remote_session:close(reason); |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
134 end |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
135 end |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
136 |
4731
84596fc32b31
hostmanager: Add some TODO comments
Matthew Wild <mwild1@gmail.com>
parents:
4730
diff
changeset
|
137 -- TODO: This should be done in modulemanager |
1975
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
138 if host_session.modules then |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
139 for module in pairs(host_session.modules) do |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
140 modulemanager.unload(host, module); |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
141 end |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
142 end |
a9998fac292c
hostmanager: deactivate() now accepts a reason, closes s2s connections as well as disconnecting users, and unloads modules for the host
Matthew Wild <mwild1@gmail.com>
parents:
1974
diff
changeset
|
143 |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
144 hosts[host] = nil; |
3601
829e23b374cc
hostmanager: Don't include hosts with '@' or '/' in the name in the get_children(host) result.
Waqas Hussain <waqas20@gmail.com>
parents:
3599
diff
changeset
|
145 if not host:match("[@/]") then |
829e23b374cc
hostmanager: Don't include hosts with '@' or '/' in the name in the get_children(host) result.
Waqas Hussain <waqas20@gmail.com>
parents:
3599
diff
changeset
|
146 disco_items:remove(host:match("%.(.*)") or "*", host); |
829e23b374cc
hostmanager: Don't include hosts with '@' or '/' in the name in the get_children(host) result.
Waqas Hussain <waqas20@gmail.com>
parents:
3599
diff
changeset
|
147 end |
3434
428f13c098d5
hostmanager: Remove dependency on eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
2984
diff
changeset
|
148 prosody_events.fire_event("host-deactivated", host); |
575
428c951d0a33
Log in hostmanager when a vhost is activated/deactivated
Matthew Wild <mwild1@gmail.com>
parents:
569
diff
changeset
|
149 log("info", "Deactivated host: %s", host); |
3716
ebb2c6209e24
hostmanager: deactivate() now returns true on success.
Waqas Hussain <waqas20@gmail.com>
parents:
3715
diff
changeset
|
150 return true; |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
151 end |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
152 |
3599
adc0b4df6fdd
hostmanager: Added function get_children(host) which copies componentmanager.get_children(host).
Waqas Hussain <waqas20@gmail.com>
parents:
3597
diff
changeset
|
153 function get_children(host) |
adc0b4df6fdd
hostmanager: Added function get_children(host) which copies componentmanager.get_children(host).
Waqas Hussain <waqas20@gmail.com>
parents:
3597
diff
changeset
|
154 return disco_items:get(host) or NULL; |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
155 end |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
156 |
1974
cfac07d8428e
hostmanager: Add return _M;
Matthew Wild <mwild1@gmail.com>
parents:
1925
diff
changeset
|
157 return _M; |