diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-04-20 03:03:07 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-04-20 03:03:07 +0100 |
commit | dabd9b0b5364630a603daecd3261d45999eff3c7 (patch) | |
tree | dc7e3765689e50d37e541743d7e88ba9f0144b0d /core/configmanager.lua | |
parent | f0a842ae4bcf5b7d09a08b65275e4b828838cfe5 (diff) | |
parent | cface37b4928e922a43ef37d1bc49ab3a4009479 (diff) | |
download | prosody-dabd9b0b5364630a603daecd3261d45999eff3c7.tar.gz prosody-dabd9b0b5364630a603daecd3261d45999eff3c7.zip |
Merging stable into unstable
Diffstat (limited to 'core/configmanager.lua')
-rw-r--r-- | core/configmanager.lua | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua index 299374ec..37646017 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -12,6 +12,8 @@ local _G = _G; local setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type = setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type; +local eventmanager = require "core.eventmanager"; + module "configmanager" local parsers = {}; @@ -68,6 +70,9 @@ function load(filename, format) if f then local ok, err = parsers[format].load(f:read("*a")); f:close(); + if ok then + eventmanager.fire_event("config-reloaded", { filename = filename, format = format }); + end return ok, "parser", err; end return f, "file", err; |