aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2017-05-27 15:32:28 +0100
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2017-05-27 15:32:28 +0100
commit4941d65177e7ebd1ac888d86ec4cd8e734ab79d5 (patch)
tree05ed61ebdccd645c61d205fe4e9ceab235120c3c
parentd850a7e3c090827b1f0d9f5bc3950c057aa48e49 (diff)
downloadprosody-im-server-4941d65177e7ebd1ac888d86ec4cd8e734ab79d5.tar
prosody-im-server-4941d65177e7ebd1ac888d86ec4cd8e734ab79d5.zip
configmanager: Remove support for multiple parsers, fixes #852.
-rw-r--r--core/configmanager.lua27
-rwxr-xr-xprosody4
-rwxr-xr-xprosodyctl4
3 files changed, 8 insertions, 27 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua
index 5a544375..3f7bfca0 100644
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -27,7 +27,7 @@ local _ENV = nil;
_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 = setmetatable({ ["*"] = { } }, config_mt);
@@ -77,11 +77,11 @@ end
function _M.load(filename, config_format)
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);
if f then
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();
if ok then
config = new_config;
@@ -103,26 +103,11 @@ function _M.load(filename, config_format)
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
do
local pcall = _G.pcall;
- parsers.lua = {};
- function parsers.lua.load(data, config_file, config_table)
+ parser = {};
+ function parser.load(data, config_file, config_table)
local env;
-- The ' = true' are needed so as not to set off __newindex when we assign the functions below
env = setmetatable({
@@ -211,7 +196,7 @@ do
file = resolve_relative_path(config_file:gsub("[^"..path_sep.."]+$", ""), file);
local f, err = io.open(file);
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
end
if not f then error("Error loading included "..file..": "..err, 0); end
diff --git a/prosody b/prosody
index 7a0d3552..7f6b1c2d 100755
--- a/prosody
+++ b/prosody
@@ -76,9 +76,7 @@ function read_config()
elseif os.getenv("PROSODY_CONFIG") then -- Passed by prosodyctl
table.insert(filenames, os.getenv("PROSODY_CONFIG"));
else
- for _, format in ipairs(config.parsers()) do
- table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg."..format);
- end
+ table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
end
for _,_filename in ipairs(filenames) do
filename = _filename;
diff --git a/prosodyctl b/prosodyctl
index 1d4296bf..e1f3e321 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -74,9 +74,7 @@ do
end
table.remove(arg, 1); table.remove(arg, 1);
else
- for _, format in ipairs(config.parsers()) do
- table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg."..format);
- end
+ table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
end
for _,_filename in ipairs(filenames) do
filename = _filename;