Software `/` code `/` prosody

Annotate

core/configmanager.lua @ 1387:64f18488b275

util.pluginloader: Remove unnecessary return value suppressing the real load error

author	Matthew Wild <mwild1@gmail.com>
date	Mon, 22 Jun 2009 21:56:52 +0100
parent	1000:a73715a9267f
child	1504:9d8c35e98ca2

rev	line source
896 2c0b9e3c11c3 0.3->0.4 Matthew Wild <mwild1@gmail.com> parents: 857 diff changeset	1 -- Prosody IM v0.4
760 90ce865eebd8 Update copyright notices for 2009 Matthew Wild <mwild1@gmail.com> parents: 759 diff changeset	2 -- Copyright (C) 2008-2009 Matthew Wild
90ce865eebd8 Update copyright notices for 2009 Matthew Wild <mwild1@gmail.com> parents: 759 diff changeset	3 -- Copyright (C) 2008-2009 Waqas Hussain
519 cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	4 --
758 b1885732e979 GPL->MIT! Matthew Wild <mwild1@gmail.com> parents: 750 diff changeset	5 -- This project is MIT/X11 licensed. Please see the
b1885732e979 GPL->MIT! Matthew Wild <mwild1@gmail.com> parents: 750 diff changeset	6 -- COPYING file in the source package for more information.
519 cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	7 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	8
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	9
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	10
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	11 local _G = _G;
857 49298263f241 core.configmanager: Small fix to check validity of Component definitions Matthew Wild <mwild1@gmail.com> parents: 795 diff changeset	12 local setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type =
49298263f241 core.configmanager: Small fix to check validity of Component definitions Matthew Wild <mwild1@gmail.com> parents: 795 diff changeset	13 setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type;
466 0ecfd89c2cc0 Fix for configmanager when config file can't be found Matthew Wild <mwild1@gmail.com> parents: 376 diff changeset	14
1000 a73715a9267f core.configmanager: Fire event when (re)loading config file Matthew Wild <mwild1@gmail.com> parents: 913 diff changeset	15 local eventmanager = require "core.eventmanager";
a73715a9267f core.configmanager: Fire event when (re)loading config file Matthew Wild <mwild1@gmail.com> parents: 913 diff changeset	16
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	17 module "configmanager"
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	18
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	19 local parsers = {};
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	20
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	21 local config = { ["*"] = { core = {} } };
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	22
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	23 local global_config = config["*"];
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	24
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	25 -- When host not found, use global
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	26 setmetatable(config, { __index = function () return global_config; end});
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	27 local host_mt = { __index = global_config };
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	28
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	29 -- When key not found in section, check key in global's section
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	30 function section_mt(section_name)
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	31 return { __index = function (t, k)
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	32 local section = rawget(global_config, section_name);
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	33 if not section then return nil; end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	34 return section[k];
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	35 end };
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	36 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	37
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	38 function getconfig()
6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	39 return config;
6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	40 end
6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	41
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	42 function get(host, section, key)
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	43 local sec = config[host][section];
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	44 if sec then
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	45 return sec[key];
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	46 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	47 return nil;
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	48 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	49
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	50 function set(host, section, key, value)
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	51 if host and section and key then
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	52 local hostconfig = rawget(config, host);
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	53 if not hostconfig then
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	54 hostconfig = rawset(config, host, setmetatable({}, host_mt))[host];
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	55 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	56 if not rawget(hostconfig, section) then
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	57 hostconfig[section] = setmetatable({}, section_mt(section));
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	58 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	59 hostconfig[section][key] = value;
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	60 return true;
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	61 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	62 return false;
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	63 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	64
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	65 function load(filename, format)
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	66 format = format or filename:match("%w+$");
466 0ecfd89c2cc0 Fix for configmanager when config file can't be found Matthew Wild <mwild1@gmail.com> parents: 376 diff changeset	67
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	68 if parsers[format] and parsers[format].load then
466 0ecfd89c2cc0 Fix for configmanager when config file can't be found Matthew Wild <mwild1@gmail.com> parents: 376 diff changeset	69 local f, err = io.open(filename);
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	70 if f then
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	71 local ok, err = parsers[format].load(f:read("*a"));
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	72 f:close();
1000 a73715a9267f core.configmanager: Fire event when (re)loading config file Matthew Wild <mwild1@gmail.com> parents: 913 diff changeset	73 if ok then
a73715a9267f core.configmanager: Fire event when (re)loading config file Matthew Wild <mwild1@gmail.com> parents: 913 diff changeset	74 eventmanager.fire_event("config-reloaded", { filename = filename, format = format });
a73715a9267f core.configmanager: Fire event when (re)loading config file Matthew Wild <mwild1@gmail.com> parents: 913 diff changeset	75 end
793 55add3b87c01 Report errors in the config file to the user Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	76 return ok, "parser", err;
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	77 end
793 55add3b87c01 Report errors in the config file to the user Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	78 return f, "file", err;
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	79 end
466 0ecfd89c2cc0 Fix for configmanager when config file can't be found Matthew Wild <mwild1@gmail.com> parents: 376 diff changeset	80
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	81 if not format then
793 55add3b87c01 Report errors in the config file to the user Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	82 return nil, "file", "no parser specified";
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	83 else
793 55add3b87c01 Report errors in the config file to the user Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	84 return nil, "file", "no parser for "..(format);
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	85 end
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	86 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	87
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	88 function save(filename, format)
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	89 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	90
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	91 function addparser(format, parser)
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	92 if format and parser then
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	93 parsers[format] = parser;
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	94 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	95 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	96
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	97 -- Built-in Lua parser
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	98 do
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	99 local loadstring, pcall, setmetatable = _G.loadstring, _G.pcall, _G.setmetatable;
6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	100 local setfenv, rawget, tostring = _G.setfenv, _G.rawget, _G.tostring;
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	101 parsers.lua = {};
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	102 function parsers.lua.load(data)
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	103 local env;
750 fbfcf8c1c830 configmanager: Add support for defining components Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	104 -- The ' = true' are needed so as not to set off __newindex when we assign the functions below
794 912dc389935a Add Include command to include extra configuration files from the main one Matthew Wild <mwild1@gmail.com> parents: 793 diff changeset	105 env = setmetatable({ Host = true; host = true; Component = true, component = true,
795 e27a48e35bbb Add RunScript command to config to run a Lua script prior to starting the server Matthew Wild <mwild1@gmail.com> parents: 794 diff changeset	106 Include = true, include = true, RunScript = dofile }, { __index = function (t, k)
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	107 return rawget(_G, k) or
6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	108 function (settings_table)
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	109 config[__currenthost or "*"][k] = settings_table;
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	110 end;
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	111 end,
6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	112 __newindex = function (t, k, v)
6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	113 set(env.__currenthost or "*", "core", k, v);
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	114 end});
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	115
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	116 function env.Host(name)
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	117 rawset(env, "__currenthost", name);
750 fbfcf8c1c830 configmanager: Add support for defining components Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	118 -- Needs at least one setting to logically exist :)
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	119 set(name or "*", "core", "defined", true);
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	120 end
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	121 env.host = env.Host;
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	122
750 fbfcf8c1c830 configmanager: Add support for defining components Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	123 function env.Component(name)
913 3e2dac84017d core.configmanager: Make components use 'component' module by default if none specified Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	124 set(name, "core", "component_module", "component");
3e2dac84017d core.configmanager: Make components use 'component' module by default if none specified Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	125 -- Don't load the global modules by default
3e2dac84017d core.configmanager: Make components use 'component' module by default if none specified Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	126 set(name, "core", "modules_enable", false);
3e2dac84017d core.configmanager: Make components use 'component' module by default if none specified Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	127 rawset(env, "__currenthost", name);
3e2dac84017d core.configmanager: Make components use 'component' module by default if none specified Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	128
750 fbfcf8c1c830 configmanager: Add support for defining components Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	129 return function (module)
857 49298263f241 core.configmanager: Small fix to check validity of Component definitions Matthew Wild <mwild1@gmail.com> parents: 795 diff changeset	130 if type(module) == "string" then
49298263f241 core.configmanager: Small fix to check validity of Component definitions Matthew Wild <mwild1@gmail.com> parents: 795 diff changeset	131 set(name, "core", "component_module", module);
49298263f241 core.configmanager: Small fix to check validity of Component definitions Matthew Wild <mwild1@gmail.com> parents: 795 diff changeset	132 end
750 fbfcf8c1c830 configmanager: Add support for defining components Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	133 end
fbfcf8c1c830 configmanager: Add support for defining components Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	134 end
fbfcf8c1c830 configmanager: Add support for defining components Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	135 env.component = env.Component;
fbfcf8c1c830 configmanager: Add support for defining components Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	136
794 912dc389935a Add Include command to include extra configuration files from the main one Matthew Wild <mwild1@gmail.com> parents: 793 diff changeset	137 function env.Include(file)
912dc389935a Add Include command to include extra configuration files from the main one Matthew Wild <mwild1@gmail.com> parents: 793 diff changeset	138 local f, err = io.open(file);
912dc389935a Add Include command to include extra configuration files from the main one Matthew Wild <mwild1@gmail.com> parents: 793 diff changeset	139 if f then
912dc389935a Add Include command to include extra configuration files from the main one Matthew Wild <mwild1@gmail.com> parents: 793 diff changeset	140 local data = f:read("*a");
912dc389935a Add Include command to include extra configuration files from the main one Matthew Wild <mwild1@gmail.com> parents: 793 diff changeset	141 local ok, err = parsers.lua.load(data);
912dc389935a Add Include command to include extra configuration files from the main one Matthew Wild <mwild1@gmail.com> parents: 793 diff changeset	142 if not ok then error(err:gsub("%[string.-%]", file), 0); end
912dc389935a Add Include command to include extra configuration files from the main one Matthew Wild <mwild1@gmail.com> parents: 793 diff changeset	143 end
912dc389935a Add Include command to include extra configuration files from the main one Matthew Wild <mwild1@gmail.com> parents: 793 diff changeset	144 if not f then error("Error loading included "..file..": "..err, 0); end
912dc389935a Add Include command to include extra configuration files from the main one Matthew Wild <mwild1@gmail.com> parents: 793 diff changeset	145 return f, err;
912dc389935a Add Include command to include extra configuration files from the main one Matthew Wild <mwild1@gmail.com> parents: 793 diff changeset	146 end
912dc389935a Add Include command to include extra configuration files from the main one Matthew Wild <mwild1@gmail.com> parents: 793 diff changeset	147 env.include = env.Include;
912dc389935a Add Include command to include extra configuration files from the main one Matthew Wild <mwild1@gmail.com> parents: 793 diff changeset	148
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	149 local chunk, err = loadstring(data);
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	150
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	151 if not chunk then
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	152 return nil, err;
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	153 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	154
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	155 setfenv(chunk, env);
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	156
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	157 local ok, err = pcall(chunk);
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	158
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	159 if not ok then
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	160 return nil, err;
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	161 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	162
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	163 return true;
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	164 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	165
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	166 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	167
466 0ecfd89c2cc0 Fix for configmanager when config file can't be found Matthew Wild <mwild1@gmail.com> parents: 376 diff changeset	168 return _M;

prosody

64f18488b275

core/configmanager.lua

Software / code / prosody

Annotate

core/configmanager.lua @ 1387:64f18488b275

Software `/` code `/` prosody