Mercurial > prosody-hg

comparison core/configmanager.lua @ 1013:943f2cd7e480

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging stable into unstable
author Matthew Wild <mwild1@gmail.com>
date Mon, 20 Apr 2009 03:03:07 +0100
parents a73715a9267f
children 9d8c35e98ca2
comparison
equal deleted inserted replaced
1012:d53108635407 1013:943f2cd7e480
9 9
10 10
11 local _G = _G; 11 local _G = _G;
12 local setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type = 12 local setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type =
13 setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type; 13 setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type;
14
15 local eventmanager = require "core.eventmanager";
14 16
15 module "configmanager" 17 module "configmanager"
16 18
17 local parsers = {}; 19 local parsers = {};
18 20
66 if parsers[format] and parsers[format].load then 68 if parsers[format] and parsers[format].load then
67 local f, err = io.open(filename); 69 local f, err = io.open(filename);
68 if f then 70 if f then
69 local ok, err = parsers[format].load(f:read("*a")); 71 local ok, err = parsers[format].load(f:read("*a"));
70 f:close(); 72 f:close();
73 if ok then
74 eventmanager.fire_event("config-reloaded", { filename = filename, format = format });
75 end
71 return ok, "parser", err; 76 return ok, "parser", err;
72 end 77 end
73 return f, "file", err; 78 return f, "file", err;
74 end 79 end
75 80