From 4517552d8ba7d8c57794e2c74c7d73c64cbeb960 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 24 Jan 2013 00:58:17 +0100 Subject: s2smanager: Generate session names used for logging the same way everywhere --- core/s2smanager.lua | 2 +- core/sessionmanager.lua | 2 +- plugins/mod_component.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 4c018713..6049e12e 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -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 diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index d505492e..05b2d64b 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -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; diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua index 16084a78..74b02843 100644 --- a/plugins/mod_component.lua +++ b/plugins/mod_component.lua @@ -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; -- cgit v1.2.3