# HG changeset patch # User Matthew Wild # Date 1279374616 -3600 # Node ID b7600dd7cd42c3c79e318a4f579a62f2218dd336 # Parent c7acddf80583ac7ffd5241122e9e8130320aaee6 configmanager: Remove dependency on eventmanager, and global 'prosody' object diff -r c7acddf80583 -r b7600dd7cd42 core/configmanager.lua --- a/core/configmanager.lua Fri Jul 16 22:47:26 2010 +0100 +++ b/core/configmanager.lua Sat Jul 17 14:50:16 2010 +0100 @@ -13,7 +13,7 @@ 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 @@ 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