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: Remove support for multiple parsers, fixes #852.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-27 15:32:28 +01:00
parent 30cd746fdf
commit eb231e9eab
3 changed files with 8 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

27
core/configmanager.lua
View file

@ -27,7 +27,7 @@ local _ENV = nil;
_M.resolve_relative_path = resolve_relative_path; -- COMPAT _M.resolve_relative_path = resolve_relative_path; -- COMPAT
local parsers = {}; local parser = nil;
local config_mt = { __index = function (t, _) return rawget(t, "*"); end}; local config_mt = { __index = function (t, _) return rawget(t, "*"); end};
local config = setmetatable({ ["*"] = { } }, config_mt); local config = setmetatable({ ["*"] = { } }, config_mt);
@ -77,11 +77,11 @@ end
function _M.load(filename, config_format) function _M.load(filename, config_format)
config_format = config_format or filename:match("%w+$"); config_format = config_format or filename:match("%w+$");
if parsers[config_format] and parsers[config_format].load then if config_format == "lua" then
local f, err = io.open(filename); local f, err = io.open(filename);
if f then if f then
local new_config = setmetatable({ ["*"] = { } }, config_mt); local new_config = setmetatable({ ["*"] = { } }, config_mt);
local ok, err = parsers[config_format].load(f:read("*a"), filename, new_config); local ok, err = parser.load(f:read("*a"), filename, new_config);
f:close(); f:close();
if ok then if ok then
config = new_config; config = new_config;
@ -103,26 +103,11 @@ function _M.load(filename, config_format)
end end
end end
function _M.addparser(config_format, parser)
if config_format and parser then
parsers[config_format] = parser;
end
end
-- _M needed to avoid name clash with local 'parsers'
function _M.parsers()
local p = {};
for config_format in pairs(parsers) do
table.insert(p, config_format);
end
return p;
end
-- Built-in Lua parser -- Built-in Lua parser
do do
local pcall = _G.pcall; local pcall = _G.pcall;
parsers.lua = {}; parser = {};
function parsers.lua.load(data, config_file, config_table) function parser.load(data, config_file, config_table)
local env; local env;
-- The ' = true' are needed so as not to set off __newindex when we assign the functions below -- The ' = true' are needed so as not to set off __newindex when we assign the functions below
env = setmetatable({ env = setmetatable({
@ -211,7 +196,7 @@ do
file = resolve_relative_path(config_file:gsub("[^"..path_sep.."]+$", ""), file); file = resolve_relative_path(config_file:gsub("[^"..path_sep.."]+$", ""), file);
local f, err = io.open(file); local f, err = io.open(file);
if f then if f then
local ret, err = parsers.lua.load(f:read("*a"), file, config_table); local ret, err = parser.load(f:read("*a"), file, config_table);
if not ret then error(err:gsub("%[string.-%]", file), 0); end if not ret then error(err:gsub("%[string.-%]", file), 0); end
end end
if not f then error("Error loading included "..file..": "..err, 0); end if not f then error("Error loading included "..file..": "..err, 0); end

4
prosody
View file

@ -76,9 +76,7 @@ function read_config()
elseif os.getenv("PROSODY_CONFIG") then -- Passed by prosodyctl elseif os.getenv("PROSODY_CONFIG") then -- Passed by prosodyctl
table.insert(filenames, os.getenv("PROSODY_CONFIG")); table.insert(filenames, os.getenv("PROSODY_CONFIG"));
else else
for _, format in ipairs(config.parsers()) do table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg."..format);
end
end end
for _,_filename in ipairs(filenames) do for _,_filename in ipairs(filenames) do
filename = _filename; filename = _filename;

4
prosodyctl
View file

@ -74,9 +74,7 @@ do
end end
table.remove(arg, 1); table.remove(arg, 1); table.remove(arg, 1); table.remove(arg, 1);
else else
for _, format in ipairs(config.parsers()) do table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg."..format);
end
end end
for _,_filename in ipairs(filenames) do for _,_filename in ipairs(filenames) do
filename = _filename; filename = _filename;