mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users.

Browse source
This commit is contained in:
Matthew Wild 2013-03-22 11:21:24 +00:00
parent 0c46e400af
commit ee5a8c9543
3 changed files with 37 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

77
core/configmanager.lua
View file

@ -22,62 +22,48 @@ module "configmanager"
local parsers = {}; local parsers = {};
local config_mt = { __index = function (t, k) return rawget(t, "*"); end}; local config_mt = { __index = function (t, k) return rawget(t, "*"); end};
local config = setmetatable({ ["*"] = { core = {} } }, config_mt); local config = setmetatable({ ["*"] = { } }, config_mt);
-- When host not found, use global -- When host not found, use global
local host_mt = { }; local host_mt = { };
-- When key not found in section, check key in global's section
function section_mt(section_name)
return { __index = function (t, k)
local section = rawget(config["*"], section_name);
if not section then return nil; end
return section[k];
end
};
end
function getconfig() function getconfig()
return config; return config;
end end
function get(host, section, key) function get(host, key, _oldkey)
if not key then if key == "core" then
section, key = "core", section; key = _oldkey; -- COMPAT with code that still uses "core"
end end
local sec = config[host][section]; return config[host][key];
if sec then
return sec[key];
end
return nil;
end end
function _M.rawget(host, section, key) function _M.rawget(host, key, _oldkey)
if key == "core" then
key = _oldkey; -- COMPAT with code that still uses "core"
end
local hostconfig = rawget(config, host); local hostconfig = rawget(config, host);
if hostconfig then if hostconfig then
local sectionconfig = rawget(hostconfig, section); return rawget(hostconfig, key);
if sectionconfig then
return rawget(sectionconfig, key);
end
end end
end end
local function set(config, host, section, key, value) local function set(config, host, key, value)
if host and section and key then if host and key then
local hostconfig = rawget(config, host); local hostconfig = rawget(config, host);
if not hostconfig then if not hostconfig then
hostconfig = rawset(config, host, setmetatable({}, host_mt))[host]; hostconfig = rawset(config, host, setmetatable({}, host_mt))[host];
end end
if not rawget(hostconfig, section) then hostconfig[key] = value;
hostconfig[section] = setmetatable({}, section_mt(section));
end
hostconfig[section][key] = value;
return true; return true;
end end
return false; return false;
end end
function _M.set(host, section, key, value) function _M.set(host, key, value, _oldvalue)
return set(config, host, section, key, value); if key == "core" then
key, value = value, _oldvalue; --COMPAT with code that still uses "core"
end
return set(config, host, key, value);
end end
-- Helper function to resolve relative paths (needed by config) -- Helper function to resolve relative paths (needed by config)
@ -122,7 +108,7 @@ function load(filename, format)
if parsers[format] and parsers[format].load then if parsers[format] and parsers[format].load then
local f, err = io.open(filename); local f, err = io.open(filename);
if f then if f then
local new_config = setmetatable({ ["*"] = { core = {} } }, config_mt); local new_config = setmetatable({ ["*"] = { } }, config_mt);
local ok, err = parsers[format].load(f:read("*a"), filename, new_config); local ok, err = parsers[format].load(f:read("*a"), filename, new_config);
f:close(); f:close();
if ok then if ok then
@ -176,53 +162,50 @@ do
Component = true, component = true, Component = true, component = true,
Include = true, include = true, RunScript = true }, { Include = true, include = true, RunScript = true }, {
__index = function (t, k) __index = function (t, k)
return rawget(_G, k) or return rawget(_G, k);
function (settings_table)
config[__currenthost or "*"][k] = settings_table;
end;
end, end,
__newindex = function (t, k, v) __newindex = function (t, k, v)
set(config, env.__currenthost or "*", "core", k, v); set(config, env.__currenthost or "*", k, v);
end end
}); });
rawset(env, "__currenthost", "*") -- Default is global rawset(env, "__currenthost", "*") -- Default is global
function env.VirtualHost(name) function env.VirtualHost(name)
if rawget(config, name) and rawget(config[name].core, "component_module") then if rawget(config, name) and rawget(config[name], "component_module") then
error(format("Host %q clashes with previously defined %s Component %q, for services use a sub-domain like conference.%s", error(format("Host %q clashes with previously defined %s Component %q, for services use a sub-domain like conference.%s",
name, config[name].core.component_module:gsub("^%a+$", { component = "external", muc = "MUC"}), name, name), 0); name, config[name].component_module:gsub("^%a+$", { component = "external", muc = "MUC"}), name, name), 0);
end end
rawset(env, "__currenthost", name); rawset(env, "__currenthost", name);
-- Needs at least one setting to logically exist :) -- Needs at least one setting to logically exist :)
set(config, name or "*", "core", "defined", true); set(config, name or "*", "defined", true);
return function (config_options) return function (config_options)
rawset(env, "__currenthost", "*"); -- Return to global scope rawset(env, "__currenthost", "*"); -- Return to global scope
for option_name, option_value in pairs(config_options) do for option_name, option_value in pairs(config_options) do
set(config, name or "*", "core", option_name, option_value); set(config, name or "*", option_name, option_value);
end end
end; end;
end end
env.Host, env.host = env.VirtualHost, env.VirtualHost; env.Host, env.host = env.VirtualHost, env.VirtualHost;
function env.Component(name) function env.Component(name)
if rawget(config, name) and rawget(config[name].core, "defined") and not rawget(config[name].core, "component_module") then if rawget(config, name) and rawget(config[name], "defined") and not rawget(config[name], "component_module") then
error(format("Component %q clashes with previously defined Host %q, for services use a sub-domain like conference.%s", error(format("Component %q clashes with previously defined Host %q, for services use a sub-domain like conference.%s",
name, name, name), 0); name, name, name), 0);
end end
set(config, name, "core", "component_module", "component"); set(config, name, "component_module", "component");
-- Don't load the global modules by default -- Don't load the global modules by default
set(config, name, "core", "load_global_modules", false); set(config, name, "load_global_modules", false);
rawset(env, "__currenthost", name); rawset(env, "__currenthost", name);
local function handle_config_options(config_options) local function handle_config_options(config_options)
rawset(env, "__currenthost", "*"); -- Return to global scope rawset(env, "__currenthost", "*"); -- Return to global scope
for option_name, option_value in pairs(config_options) do for option_name, option_value in pairs(config_options) do
set(config, name or "*", "core", option_name, option_value); set(config, name or "*", option_name, option_value);
end end
end end
return function (module) return function (module)
if type(module) == "string" then if type(module) == "string" then
set(config, name, "core", "component_module", module); set(config, name, "component_module", module);
return handle_config_options; return handle_config_options;
end end
return handle_config_options(module); return handle_config_options(module);

10
core/hostmanager.lua
View file

@ -37,8 +37,8 @@ local function load_enabled_hosts(config)
local activated_any_host; local activated_any_host;
for host, host_config in pairs(defined_hosts) do for host, host_config in pairs(defined_hosts) do
if host ~= "*" and host_config.core.enabled ~= false then if host ~= "*" and host_config.enabled ~= false then
if not host_config.core.component_module then if not host_config.component_module then
activated_any_host = true; activated_any_host = true;
end end
activate(host, host_config); activate(host, host_config);
@ -78,7 +78,7 @@ function activate(host, host_config)
send = host_send; send = host_send;
modules = {}; modules = {};
}; };
if not host_config.core.component_module then -- host if not host_config.component_module then -- host
host_session.type = "local"; host_session.type = "local";
host_session.sessions = {}; host_session.sessions = {};
else -- component else -- component
@ -86,9 +86,9 @@ function activate(host, host_config)
end end
hosts[host] = host_session; hosts[host] = host_session;
if not host:match("[@/]") then if not host:match("[@/]") then
disco_items:set(host:match("%.(.*)") or "*", host, host_config.core.name or true); disco_items:set(host:match("%.(.*)") or "*", host, host_config.name or true);
end end
for option_name in pairs(host_config.core) do for option_name in pairs(host_config) do
if option_name:match("_ports$") or option_name:match("_interface$") then if option_name:match("_ports$") or option_name:match("_interface$") then
log("warn", "%s: Option '%s' has no effect for virtual hosts - put it in the server-wide section instead", host, option_name); log("warn", "%s: Option '%s' has no effect for virtual hosts - put it in the server-wide section instead", host, option_name);
end end

4
prosody
View file

@ -132,8 +132,8 @@ end
function sanity_check() function sanity_check()
for host, host_config in pairs(config.getconfig()) do for host, host_config in pairs(config.getconfig()) do
if host ~= "*" if host ~= "*"
and host_config.core.enabled ~= false and host_config.enabled ~= false
and not host_config.core.component_module then and not host_config.component_module then
return; return;
end end
end end