prosody
831c84cbf5fa

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

1075:831c84cbf5fa

s2smanager: Miscellaneous logging improvements, changing levels, improving messages and using session loggers where possible
author Matthew Wild <mwild1@gmail.com>
date Thu, 30 Apr 2009 02:43:12 +0100
parents 1074:7798735be42b
children 1076:ba3639692493
files core/s2smanager.lua
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/core/s2smanager.lua	Thu Apr 30 02:30:03 2009 +0100
+++ b/core/s2smanager.lua	Thu Apr 30 02:43:12 2009 +0100
@@ -48,7 +48,7 @@
 local function bounce_sendq(session)
 	local sendq = session.sendq;
 	if sendq then
-		session.log("debug", "sending error replies for "..#sendq.." queued stanzas because of failed outgoing connection to "..tostring(session.to_host));
+		session.log("info", "sending error replies for "..#sendq.." queued stanzas because of failed outgoing connection to "..tostring(session.to_host));
 		local dummy = {
 			type = "s2sin";
 			send = function(s)
@@ -199,9 +199,9 @@
 		host_session.srv_choice = host_session.srv_choice + 1;
 		local srv_choice = host_session.srv_hosts[host_session.srv_choice];
 		connect_host, connect_port = srv_choice.target or to_host, srv_choice.port or connect_port;
-		host_session.log("debug", "Connection failed (%s). Attempt #%d: This time to %s:%d", tostring(err), host_session.srv_choice, connect_host, connect_port);
+		host_session.log("info", "Connection failed (%s). Attempt #%d: This time to %s:%d", tostring(err), host_session.srv_choice, connect_host, connect_port);
 	else
-		host_session.log("debug", "Out of connection options, can't connect to %s", tostring(host_session.to_host));
+		host_session.log("info", "Out of connection options, can't connect to %s", tostring(host_session.to_host));
 		-- We're out of options
 		return false;
 	end
@@ -216,7 +216,7 @@
 end
 
 function try_connect(host_session, connect_host, connect_port)
-	log("debug", "Beginning new connection attempt to %s (%s:%d)", host_session.to_host, connect_host, connect_port);
+	host_session.log("info", "Beginning new connection attempt to %s (%s:%d)", host_session.to_host, connect_host, connect_port);
 	-- Ok, we're going to try to connect
 	
 	local from_host, to_host = host_session.from_host, host_session.to_host;
@@ -338,7 +338,7 @@
 	else
 		return false;
 	end
-	session.log("info", "connection is now authenticated");
+	session.log("debug", "connection %s->%s is now authenticated", session.from_host or "(unknown)", session.to_host or "(unknown)");
 	
 	mark_connected(session);
 	
@@ -350,7 +350,7 @@
 	
 	local from, to = session.from_host, session.to_host;
 	
-	session.log("debug", session.direction.." s2s connection "..from.."->"..to.." is now complete");
+	session.log("info", session.direction.." s2s connection "..from.."->"..to.." complete");
 	
 	local send_to_host = send_to_host;
 	function session.send(data) send_to_host(to, from, data); end