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 8ca5ee54a7d3ff1546dd52c95deda74cff35fd8f..1f98bccc1fca70811d8c8d7948a554fb0e94e8b4 100644 (file)
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -1,6 +1,6 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -9,8 +9,10 @@
 
 
 local _G = _G;
-local  setmetatable, loadfile, pcall, rawget, rawset, io = 
-               setmetatable, loadfile, pcall, rawget, rawset, io;
+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";
 
 module "configmanager"
 
@@ -66,17 +68,20 @@ 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();
-                       return ok, err;
+                       if ok then
+                               eventmanager.fire_event("config-reloaded", { filename = filename, format = format });
+                       end
+                       return ok, "parser", err;
                end
-               return f, err;
+               return f, "file", err;
        end
 
        if not format then
-               return nil, "no parser specified";
+               return nil, "file", "no parser specified";
        else
-               return nil, "no parser for "..(format);
+               return nil, "file", "no parser for "..(format);
        end
 end
 
@@ -89,15 +94,25 @@ 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 }, { __index = function (t, k)
+               env = setmetatable({ Host = true; host = true; Component = true, component = true,
+                                                       Include = true, include = true, RunScript = dofile }, { __index = function (t, k)
                                                                                                return rawget(_G, k) or
                                                                                                                function (settings_table)
                                                                                                                        config[__currenthost or "*"][k] = settings_table;
@@ -107,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 :)
@@ -115,16 +131,32 @@ do
                env.host = env.Host;
                
                function env.Component(name)
+                       set(name, "core", "component_module", "component");
+                       -- Don't load the global modules by default
+                       set(name, "core", "load_global_modules", false);
+                       rawset(env, "__currenthost", name);
+       
                        return function (module)
-                                       set(name, "core", "component_module", module);
-                                       -- Don't load the global modules by default
-                                       set(name, "core", "modules_enable", false);
-                                       rawset(env, "__currenthost", name);
+                                       if type(module) == "string" then
+                                               set(name, "core", "component_module", module);
+                                       end
                                end
                end
                env.component = env.Component;
                
-               local chunk, err = loadstring(data);
+               function env.Include(file)
+                       local f, err = io.open(file);
+                       if f then
+                               local data = f:read("*a");
+                               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
+                       return f, err;
+               end
+               env.include = env.Include;
+               
+               local chunk, err = loadstring(data, "@"..filename);
                
                if not chunk then
                        return nil, err;