--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
--
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-- 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, pairs, table, format =
+ setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type, pairs, table, string.format;
+
+
+local eventmanager = require "core.eventmanager";
module "configmanager"
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"));
+ if f then
+ local ok, err = parsers[format].load(f:read("*a"), filename);
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, err;
+ return f, "file", err;
end
if not format then
- return nil, "no parser specified";
+ return nil, "file", "no parser specified";
else
- return nil, "no parser for "..(format);
+ return nil, "file", "no parser for "..(format);
end
end
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;
- 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;
set(env.__currenthost or "*", "core", k, v);
end});
+ rawset(env, "__currenthost", "*") -- Default is global
function env.Host(name)
+ if rawget(config, name) and rawget(config[name].core, "component_module") then
+ error(format("Host %q clashes with previously defined %s Component %q, for services use a sub-domain like conference.%s",
+ name, config[name].core.component_module:gsub("^%a+$", { component = "external", muc = "MUC"}), name, name), 0);
+ end
rawset(env, "__currenthost", name);
+ -- Needs at least one setting to logically exist :)
set(name or "*", "core", "defined", true);
end
env.host = env.Host;
- local chunk, err = loadstring(data);
+ function env.Component(name)
+ if rawget(config, name) and rawget(config[name].core, "defined") and not rawget(config[name].core, "component_module") then
+ error(format("Component %q clashes with previously defined Host %q, for services use a sub-domain like conference.%s",
+ name, name, name), 0);
+ end
+ 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, 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
+ return f, err;
+ end
+ env.include = env.Include;
+
+ local chunk, err = loadstring(data, "@"..filename);
if not chunk then
return nil, err;
projects / prosody.git / blobdiff