configmanager: Remove dependency on eventmanager, and global 'prosody' object

Sat, 17 Jul 2010 14:50:16 +0100

author
Matthew Wild <mwild1@gmail.com>
date
Sat, 17 Jul 2010 14:50:16 +0100
changeset 3384
b7600dd7cd42
parent 3383
c7acddf80583
child 3385
192ffdaef491

configmanager: Remove dependency on eventmanager, and global 'prosody' object

core/configmanager.lua file | annotate | diff | comparison | revisions
--- 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

mercurial