From 3230dc4c0a66f96726a190e30fdf67e64b8c15b8 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Wed, 3 Apr 2013 13:38:27 +0100 Subject: util.stanza: :maptags(): Fixes to make loop more robust on item removal --- util/stanza.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'util') diff --git a/util/stanza.lua b/util/stanza.lua index a0ab2a5a..213ed506 100644 --- a/util/stanza.lua +++ b/util/stanza.lua @@ -153,7 +153,7 @@ function stanza_mt:maptags(callback) local n_children, n_tags = #self, #tags; local i = 1; - while curr_tag <= n_tags do + while curr_tag <= n_tags and n_tags > 0 do if self[i] == tags[curr_tag] then local ret = callback(self[i]); if ret == nil then @@ -161,13 +161,15 @@ function stanza_mt:maptags(callback) t_remove(tags, curr_tag); n_children = n_children - 1; n_tags = n_tags - 1; + i = i - 1; + curr_tag = curr_tag - 1; else self[i] = ret; tags[i] = ret; end - i = i + 1; curr_tag = curr_tag + 1; end + i = i + 1; end return self; end -- cgit v1.2.3 From 2aa7b4448ebbfde9202d277bf595cbb907a03c24 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Wed, 3 Apr 2013 13:39:00 +0100 Subject: util.helpers: Helper helpers to log host events --- util/helpers.lua | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'util') diff --git a/util/helpers.lua b/util/helpers.lua index 6103a319..08b86a7c 100644 --- a/util/helpers.lua +++ b/util/helpers.lua @@ -14,6 +14,14 @@ module("helpers", package.seeall); local log = require "util.logger".init("util.debug"); +function log_host_events(host) + return log_events(prosody.hosts[host].events, host); +end + +function revert_log_host_events(host) + return revert_log_events(prosody.hosts[host].events); +end + function log_events(events, name, logger) local f = events.fire_event; if not f then -- cgit v1.2.3