net.httpserver: Allow overriding default request handler

[prosody.git] / core / configmanager.lua

diff --git a/core/configmanager.lua b/core/configmanager.lua
index 299374ecb102e6c65b637044e3103af2d3b30b69..b7ee605fcdb5bfb1cb6328eab5c7aa51b592b7aa 100644 (file)
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -12,6 +12,8 @@ local _G = _G;
 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 = {};
@@ -68,6 +70,9 @@ function load(filename, format)
                if f then 
                        local ok, err = parsers[format].load(f:read("*a"));
                        f:close();
+                       if ok then
+                               eventmanager.fire_event("config-reloaded", { filename = filename, format = format });
+                       end
                        return ok, "parser", err;
                end
                return f, "file", err;
@@ -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 :)
@@ -118,7 +124,7 @@ do
                function env.Component(name)
                        set(name, "core", "component_module", "component");
                        -- Don't load the global modules by default
-                       set(name, "core", "modules_enable", false);
+                       set(name, "core", "load_global_modules", false);
                        rawset(env, "__currenthost", name);
        
                        return function (module)