Software `/` code `/` prosody

Annotate

core/configmanager.lua @ 725:96110075288b

Replacing pretty_print() with top_tag() for logging

author	Matthew Wild <mwild1@gmail.com>
date	Fri, 16 Jan 2009 04:37:16 +0000
parent	615:4ae3e81513f3
child	750:fbfcf8c1c830

rev	line source
615 4ae3e81513f3 0.1 -> 0.2 Matthew Wild <mwild1@gmail.com> parents: 519 diff changeset	1 -- Prosody IM v0.2
519 cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	2 -- Copyright (C) 2008 Matthew Wild
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	3 -- Copyright (C) 2008 Waqas Hussain
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	4 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	5 -- This program is free software; you can redistribute it and/or
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	6 -- modify it under the terms of the GNU General Public License
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	7 -- as published by the Free Software Foundation; either version 2
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	8 -- of the License, or (at your option) any later version.
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	9 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	10 -- This program is distributed in the hope that it will be useful,
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	11 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	12 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	13 -- GNU General Public License for more details.
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	14 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	15 -- You should have received a copy of the GNU General Public License
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	16 -- along with this program; if not, write to the Free Software
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	17 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	18 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	19
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	20
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	21
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 local _G = _G;
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	23 local setmetatable, loadfile, pcall, rawget, rawset, io =
6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	24 setmetatable, loadfile, pcall, rawget, rawset, io;
466 0ecfd89c2cc0 Fix for configmanager when config file can't be found Matthew Wild <mwild1@gmail.com> parents: 376 diff changeset	25
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	26 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	27
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 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	29
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 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	31
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 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	33
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 -- 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	35 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	36 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	37
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	38 -- 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	39 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	40 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	41 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	42 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	43 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	44 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	45 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	46
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	47 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	48 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	49 end
6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	50
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	51 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	52 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	53 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	54 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	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 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	57 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	58
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 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	60 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	61 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	62 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	63 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	64 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	65 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	66 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	67 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	68 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	69 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	70 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	71 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	72 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	73
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	74 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	75 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	76
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 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	78 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	79 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	80 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	81 f:close();
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	82 return ok, 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	83 end
466 0ecfd89c2cc0 Fix for configmanager when config file can't be found Matthew Wild <mwild1@gmail.com> parents: 376 diff changeset	84 return f, 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	85 end
466 0ecfd89c2cc0 Fix for configmanager when config file can't be found Matthew Wild <mwild1@gmail.com> parents: 376 diff changeset	86
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	87 if not format then
6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	88 return nil, "no parser specified";
6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	89 else
466 0ecfd89c2cc0 Fix for configmanager when config file can't be found Matthew Wild <mwild1@gmail.com> parents: 376 diff changeset	90 return nil, "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	91 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	92 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	93
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 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	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
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	97 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	98 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	99 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	100 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	101 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	102
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 -- 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	104 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	105 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	106 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	107 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	108 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	109 local env;
6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	110 env = setmetatable({ Host = true; host = true; }, { __index = function (t, k)
6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	111 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	112 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	113 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	114 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	115 end,
6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	116 __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	117 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	118 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	119
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 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	121 rawset(env, "__currenthost", name);
6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	122 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	123 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	124 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	125
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	126 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	127
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	128 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	129 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	130 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	131
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	132 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	133
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	134 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	135
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	136 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	137 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	138 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	139
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	140 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	141 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	142
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	143 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	144
466 0ecfd89c2cc0 Fix for configmanager when config file can't be found Matthew Wild <mwild1@gmail.com> parents: 376 diff changeset	145 return _M;

prosody

96110075288b

core/configmanager.lua

Software / code / prosody

Annotate

core/configmanager.lua @ 725:96110075288b

Software `/` code `/` prosody