Comparison

modulemanager: Keep track of event handlers added by module:hook, and remove them on module unload

author	Waqas Hussain <waqas20@gmail.com>
date	Sun, 31 May 2009 13:31:20 +0500
parent	1253:60156584c442
child	1309:a544e68a0989

comparison

equal deleted inserted replaced

-:c199be608546
+:6bd11bca9725
 local modulehelpers = setmetatable({}, { __index = _G });
 local features_table = multitable_new();
 local handler_table = multitable_new();
 local hooked = multitable_new();
+local hooks = multitable_new();
 local event_hooks = multitable_new();
 local NULL = {};
 -- Load modules when a host is activated
 			handler_info[handlers[1]] = nil;
 			stanza_handlers:remove(param[1], param[2], param[3], param[4]);
 		end
 	end
 	event_hooks:remove(host, name);
+	-- unhook event handlers hooked by module:hook
+	for event, handlers in pairs(hooks:get(host, name) or NULL) do
+		for handler in pairs(handlers or NULL) do
+			(hosts[host] or prosody).events.remove_handler(event, handler);
+		end
+	end
+	hooks:remove(host, name);
 	return true;
 end
 function reload(host, name, ...)
 	local mod = get_module(host, name);
 function api:fire_event(...)
 	return (hosts[self.host] or prosody).events.fire_event(...);
 end
 function api:hook(event, handler)
+	hooks:set(self.host, self.name, event, handler, true);
 	(hosts[self.host] or prosody).events.add_handler(event, handler);
 end
 --------------------------------------------------------------------