mod_s2s_keepalive: Use timestamp as iq @id RFC 6120 implies that the id attribute must be unique within a stream. This should fix problems with remote servers that enforce uniqueness and don't answer duplicated ids. If it doesn't do that, then at least you can get a guesstimate at round-trip time from the difference between the result iq stanza and the timestamp it was logged without having to go look for when it was sent, or needing to keep state.

module:set_global();

local helpers = require "util.helpers";

local function init(module, events, name)
	helpers.log_events(events, name, module._log);

	function module.unload()
		helpers.revert_log_events(events);
	end
end

init(module, prosody.events, "global");

function module.add_host(module)
	init(module, prosody.hosts[module.host].events, module.host);
end