changeset 5813:d38772479891

mod_pubsub_serverinfo: Some logging improvements
author Matthew Wild <mwild1@gmail.com>
date Mon, 08 Jan 2024 15:51:52 +0000
parents cf5f77491323
children fa28fc2ee465
files mod_pubsub_serverinfo/mod_pubsub_serverinfo.lua
diffstat 1 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mod_pubsub_serverinfo/mod_pubsub_serverinfo.lua	Mon Jan 08 15:38:18 2024 +0000
+++ b/mod_pubsub_serverinfo/mod_pubsub_serverinfo.lua	Mon Jan 08 15:51:52 2024 +0000
@@ -29,6 +29,10 @@
 		{ name = "serverinfo-pubsub-node", type = "text-single" },
 	}:form({ ["serverinfo-pubsub-node"] = ("xmpp:%s?;node=%s"):format(service, node) }, "result"));
 
+	if cache_ttl < publication_interval then
+		module:log("warn", "It is recommended to have a cache interval higher than the publication interval");
+	end
+
 	cache_warm_up()
 	module:add_timer(10, publish_serverinfo);
 end
@@ -55,7 +59,7 @@
 			if query ~= nil then
 				for item in query:childtags("item") do
 					if item.attr.jid == service and item.attr.node == node then
-						module:log("debug", "pub/sub node '%s' at %s does exists.", node, service)
+						module:log("debug", "pub/sub node '%s' at %s does exist.", node, service)
 						return true
 					end
 				end
@@ -165,6 +169,7 @@
 end
 
 function publish_serverinfo()
+	module:log("debug", "Publishing server info...");
 	local domains_by_host = get_remote_domain_names()
 
 	-- Build the publication stanza.
@@ -236,7 +241,7 @@
 	-- We don't have a cached value, or it is nearing expiration - refresh it now
 	-- TODO worry about not having multiple requests in flight to the same domain.cached_value
 
-	module:log("debug", "No cached opt-in status for '%s': performing disco/info to determine opt-in.", remoteDomain)
+	module:log("debug", "%s: performing disco/info to determine opt-in", remoteDomain)
 	local discoRequest = st.iq({ type = "get", to = remoteDomain, from = actor, id = new_id() })
 		:tag("query", { xmlns = "http://jabber.org/protocol/disco#info" })
 
@@ -246,7 +251,7 @@
 				local query = response.stanza:get_child("query", "http://jabber.org/protocol/disco#info")
 				if query ~= nil then
 					for feature in query:childtags("feature") do
-						module:log("debug", "Disco/info feature for '%s': %s", remoteDomain, feature)
+						--module:log("debug", "Disco/info feature for '%s': %s", remoteDomain, feature)
 						if feature.attr.var == 'urn:xmpp:serverinfo:0' then
 							module:log("debug", "Disco/info response included opt-in for '%s'", remoteDomain)
 							opt_in_cache[remoteDomain] = {