diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-07-17 14:50:16 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-07-17 14:50:16 +0100 |
| commit | bab68f4fb27eceb876d525f068933fbfa995ff98 (patch) | |
| tree | 7ebf78189d2f6ac796759765427894c44e85865c /core/configmanager.lua | |
| parent | e2772919dd1b2f0f0396f1f5437629ec81c0c4e8 (diff) | |
| download | prosody-bab68f4fb27eceb876d525f068933fbfa995ff98.tar.gz prosody-bab68f4fb27eceb876d525f068933fbfa995ff98.zip | |
configmanager: Remove dependency on eventmanager, and global 'prosody' object
Diffstat (limited to 'core/configmanager.lua')
| -rw-r--r-- | core/configmanager.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua index 9b03e1c7..6b181443 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -13,7 +13,7 @@ local setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type, p setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type, pairs, table, string.format; -local eventmanager = require "core.eventmanager"; +local fire_event = prosody and prosody.events.fire_event or function () end; module "configmanager" @@ -73,7 +73,7 @@ function load(filename, format) local ok, err = parsers[format].load(f:read("*a"), filename); f:close(); if ok then - eventmanager.fire_event("config-reloaded", { filename = filename, format = format }); + fire_event("config-reloaded", { filename = filename, format = format }); end return ok, "parser", err; end |