X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;ds=sidebyside;f=core%2Fconfigmanager.lua;h=1f98bccc1fca70811d8c8d7948a554fb0e94e8b4;hb=9a42b61e1f6522baf13a72f10d4c9fc24d1325f1;hp=f04c557541c1c943484fb2c1b5e199676d49c32c;hpb=740d4f647339acbc871004de3970c46aeeeab759;p=prosody.git

diff --git a/core/configmanager.lua b/core/configmanager.lua
index f04c5575..1f98bccc 100644
--- 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
 -- 
@@ -9,8 +9,10 @@
 
 
 local _G = _G;
-local 	setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type = 
-		setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type;
+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,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;
@@ -89,12 +94,21 @@ 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,
@@ -108,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 :)
@@ -116,12 +131,14 @@ 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)
 					if type(module) == "string" then
 						set(name, "core", "component_module", module);
-						-- Don't load the global modules by default
-						set(name, "core", "modules_enable", false);
-						rawset(env, "__currenthost", name);
 					end
 				end
 		end
@@ -131,7 +148,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
@@ -139,7 +156,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;