util.pposix: Replace the unwieldy module table generation with luaL_register() call...

[prosody.git] / core / configmanager.lua

diff --git a/core/configmanager.lua b/core/configmanager.lua
index 7fc6aa134be12d73d16fabd223695995501a52f5..1f98bccc1fca70811d8c8d7948a554fb0e94e8b4 100644 (file)
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -9,8 +9,8 @@
 
 
 local _G = _G;
-local  setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type = 
-               setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type;
+local  setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type, pairs, table =
+               setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type, pairs, table;
 
 local eventmanager = require "core.eventmanager";
 
@@ -68,7 +68,7 @@ function load(filename, format)
        if parsers[format] and parsers[format].load then
                local f, err = io.open(filename);
                if f then 
-                       local ok, err = parsers[format].load(f:read("*a"));
+                       local ok, err = parsers[format].load(f:read("*a"), filename);
                        f:close();
                        if ok then
                                eventmanager.fire_event("config-reloaded", { filename = filename, format = format });
@@ -94,12 +94,21 @@ function addparser(format, parser)
        end
 end
 
+-- _M needed to avoid name clash with local 'parsers'
+function _M.parsers()
+       local p = {};
+       for format in pairs(parsers) do
+               table.insert(p, format);
+       end
+       return p;
+end
+
 -- Built-in Lua parser
 do
        local loadstring, pcall, setmetatable = _G.loadstring, _G.pcall, _G.setmetatable;
        local setfenv, rawget, tostring = _G.setfenv, _G.rawget, _G.tostring;
        parsers.lua = {};
-       function parsers.lua.load(data)
+       function parsers.lua.load(data, filename)
                local env;
                -- The ' = true' are needed so as not to set off __newindex when we assign the functions below
                env = setmetatable({ Host = true; host = true; Component = true, component = true,
@@ -113,6 +122,7 @@ do
                                                                                        set(env.__currenthost or "*", "core", k, v);
                                                                                end});
                
+               rawset(env, "__currenthost", "*") -- Default is global
                function env.Host(name)
                        rawset(env, "__currenthost", name);
                        -- Needs at least one setting to logically exist :)
@@ -138,7 +148,7 @@ do
                        local f, err = io.open(file);
                        if f then
                                local data = f:read("*a");
-                               local ok, err = parsers.lua.load(data);
+                               local ok, err = parsers.lua.load(data, file);
                                if not ok then error(err:gsub("%[string.-%]", file), 0); end
                        end
                        if not f then error("Error loading included "..file..": "..err, 0); end
@@ -146,7 +156,7 @@ do
                end
                env.include = env.Include;
                
-               local chunk, err = loadstring(data);
+               local chunk, err = loadstring(data, "@"..filename);
                
                if not chunk then
                        return nil, err;