# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1250455313 -3600
# Node ID 232c2bf155c713793fd6ff4e5e4929c542cec104
# Parent  f5e24a63d2338c21f1862fa06dda871804d9880b
core.s2smanager, xmppserver_listener: Move the responsibility of setting session.log from the latter to the former for incoming sessions (outgoing are already like this)

diff -r f5e24a63d233 -r 232c2bf155c7 core/s2smanager.lua
--- a/core/s2smanager.lua	Sun Aug 16 21:37:47 2009 +0100
+++ b/core/s2smanager.lua	Sun Aug 16 21:41:53 2009 +0100
@@ -126,6 +126,7 @@
 	end
 	open_sessions = open_sessions + 1;
 	local w, log = conn.write, logger_init("s2sin"..tostring(conn):match("[a-f0-9]+$"));
+	session.log = log;
 	session.sends2s = function (t) log("debug", "sending: %s", tostring(t)); w(tostring(t)); end
 	incoming_s2s[session] = true;
 	return session;
diff -r f5e24a63d233 -r 232c2bf155c7 net/xmppserver_listener.lua
--- a/net/xmppserver_listener.lua	Sun Aug 16 21:37:47 2009 +0100
+++ b/net/xmppserver_listener.lua	Sun Aug 16 21:41:53 2009 +0100
@@ -114,12 +114,6 @@
 		session = s2s_new_incoming(conn);
 		sessions[conn] = session;
 
-		-- Logging functions --
-
-		
-		local conn_name = "s2sin"..tostring(conn):match("[a-f0-9]+$");
-		session.log = logger.init(conn_name);
-		
 		session.log("info", "Incoming s2s connection");
 		
 		session.reset_stream = session_reset_stream;