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

diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 4c018713e143133ab43d6010d1d5ba260918f5fe..6049e12eb5f8305da2dd3022fbaad008458468c9 100644 (file)
--- 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 d505492e7a30472156a7f9d71948b43ab427b820..05b2d64b918b12cd40d53908ff4f198fcc03b785 100644 (file)
--- 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 16084a78a69b08f8bf79221f67bfdaec85fba69b..74b0284337a4ba00b8cc15903f3777374ac5b74b 100644 (file)
--- 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;