Merge with waqas

[prosody.git] / core / configmanager.lua

diff --git a/core/configmanager.lua b/core/configmanager.lua
index 5f5648b9ce27160041387b50562512f78bc39614..b7ee605fcdb5bfb1cb6328eab5c7aa51b592b7aa 100644 (file)
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -1,7 +1,19 @@
+-- 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.
+--
+
+
 
 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 = 
+               setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type;
+
+local eventmanager = require "core.eventmanager";
+
 module "configmanager"
 
 local parsers = {};
@@ -52,18 +64,24 @@ end
 
 function load(filename, format)
        format = format or filename:match("%w+$");
+
        if parsers[format] and parsers[format].load then
-               local f = io.open(filename);
+               local f, err = io.open(filename);
                if f then 
                        local ok, err = parsers[format].load(f:read("*a"));
                        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, "file", err;
        end
+
        if not format then
-               return nil, "no parser specified";
+               return nil, "file", "no parser specified";
        else
-               return false, "no parser";
+               return nil, "file", "no parser for "..(format);
        end
 end
 
@@ -83,7 +101,9 @@ do
        parsers.lua = {};
        function parsers.lua.load(data)
                local env;
-               env = setmetatable({ Host = true; host = true; }, { __index = function (t, k)
+               -- 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,
+                                                       Include = true, include = true, RunScript = dofile }, { __index = function (t, k)
                                                                                                return rawget(_G, k) or
                                                                                                                function (settings_table)
                                                                                                                        config[__currenthost or "*"][k] = settings_table;
@@ -93,12 +113,40 @@ 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 :)
                        set(name or "*", "core", "defined", true);
                end
                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)
+                                       if type(module) == "string" then
+                                               set(name, "core", "component_module", module);
+                                       end
+                               end
+               end
+               env.component = env.Component;
+               
+               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);
+                               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);
                
                if not chunk then
@@ -118,4 +166,4 @@ do
        
 end
 
-return _M;
\ No newline at end of file
+return _M;