X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fconfigmanager.lua;h=37646017407cbc4f61a8b29bbff7baacd9894da1;hb=34215744d79b2fcf146b69a59007d104085dff4a;hp=049862c204c23f6af5dee1b6ae5ee9700011095f;hpb=a1d73d930a82ca97c1fed7afe4b16b885337671f;p=prosody.git

diff --git a/core/configmanager.lua b/core/configmanager.lua
index 049862c2..37646017 100644
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.3
+-- Prosody IM v0.4
 -- 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"
 
@@ -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;
@@ -116,11 +121,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", "modules_enable", 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;