mod_bosh: Delay setup until after server is started.

[prosody.git] / core / configmanager.lua

diff --git a/core/configmanager.lua b/core/configmanager.lua
index 049862c204c23f6af5dee1b6ae5ee9700011095f..1fbe83b8258aa127cd3afed0f22ae5f8dea220fb 100644 (file)
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.3
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -9,8 +9,10 @@
 
 
 local _G = _G;
-local  setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile = 
-               setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile;
+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"
 
@@ -66,8 +68,11 @@ 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 });
+                       end
                        return ok, "parser", err;
                end
                return f, "file", err;
@@ -94,7 +99,7 @@ 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,
@@ -108,6 +113,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 :)
@@ -116,11 +122,15 @@ 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;
@@ -129,7 +139,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
@@ -137,7 +147,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;