s2smanager: Generate session names used for logging the same way everywhere

This commit is contained in:
Kim Alvefur 2013-01-24 00:58:17 +01:00
parent 4070965899
commit 4517552d8b
3 changed files with 3 additions and 3 deletions

View file

@ -35,7 +35,7 @@ function new_incoming(conn)
getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; end;
end
open_sessions = open_sessions + 1;
session.log = logger_init("s2sin"..tostring(conn):match("[a-f0-9]+$"));
session.log = logger_init("s2sin"..tostring(session):match("[a-f0-9]+$"));
incoming_s2s[session] = true;
return session;
end

View file

@ -54,7 +54,7 @@ function new_session(conn)
end
end
session.ip = conn:ip();
local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$");
local conn_name = "c2s"..tostring(session):match("[a-f0-9]+$");
session.log = logger.init(conn_name);
return session;

View file

@ -260,7 +260,7 @@ function listener.onconnect(conn)
local session = { type = "component_unauthed", conn = conn, send = function (data) return _send(conn, tostring(data)); end };
-- Logging functions --
local conn_name = "jcp"..tostring(conn):match("[a-f0-9]+$");
local conn_name = "jcp"..tostring(session):match("[a-f0-9]+$");
session.log = logger.init(conn_name);
session.close = session_close;