From 26e6087e32a55fc04c9678caddb2313ba0f1700c Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 30 Apr 2009 02:45:33 +0100 Subject: mod_dialback: Miscellaneous logging improvements, changing levels, improving messages and using session loggers where possible --- plugins/mod_dialback.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua index 855df9eb..b1bc3ae3 100644 --- a/plugins/mod_dialback.lua +++ b/plugins/mod_dialback.lua @@ -24,7 +24,7 @@ local dialback_requests = setmetatable({}, { __mode = 'v' }); module:add_handler({"s2sin_unauthed", "s2sin"}, "verify", xmlns_dialback, function (origin, stanza) -- We are being asked to verify the key, to ensure it was generated by us - log("debug", "verifying dialback key..."); + origin.log("debug", "verifying that dialback key is ours..."); local attr = stanza.attr; -- FIXME: Grr, ejabberd breaks this one too?? it is black and white in XEP-220 example 34 --if attr.from ~= origin.to_host then error("invalid-from"); end @@ -33,9 +33,9 @@ module:add_handler({"s2sin_unauthed", "s2sin"}, "verify", xmlns_dialback, type = "valid" else type = "invalid" - log("warn", "Asked to verify a dialback key that was incorrect. An imposter is claiming to be %s?", attr.to); + origin.log("warn", "Asked to verify a dialback key that was incorrect. An imposter is claiming to be %s?", attr.to); end - log("debug", "verified dialback key... it is %s", type); + origin.log("debug", "verified dialback key... it is %s", type); origin.sends2s(st.stanza("db:verify", { from = attr.to, to = attr.from, id = attr.id, type = type }):text(stanza[1])); end); @@ -48,7 +48,7 @@ module:add_handler({ "s2sin_unauthed", "s2sin" }, "result", xmlns_dialback, if not hosts[attr.to] then -- Not a host that we serve - log("info", "%s tried to connect to %s, which we don't serve", attr.from, attr.to); + origin.log("info", "%s tried to connect to %s, which we don't serve", attr.from, attr.to); origin:close("host-unknown"); return; end @@ -64,7 +64,7 @@ module:add_handler({ "s2sin_unauthed", "s2sin" }, "result", xmlns_dialback, origin.to_host = attr.to; end - log("debug", "asking %s if key %s belongs to them", attr.from, stanza[1]); + origin.log("debug", "asking %s if key %s belongs to them", attr.from, stanza[1]); send_s2s(attr.to, attr.from, st.stanza("db:verify", { from = attr.to, to = attr.from, id = origin.streamid }):text(stanza[1])); end); -- cgit v1.2.3