diff options
| author | Kim Alvefur <zash@zash.se> | 2013-01-24 00:58:17 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-01-24 00:58:17 +0100 |
| commit | 1b79eabc8a4a403c568d6c4e8350d2aa25024af1 (patch) | |
| tree | ec65141decae5fb7d07319b76bce3ba9b0ddf6c4 | |
| parent | fb589d8634dd86e2f110801d71ae93925500d4d6 (diff) | |
| download | prosody-1b79eabc8a4a403c568d6c4e8350d2aa25024af1.tar.gz prosody-1b79eabc8a4a403c568d6c4e8350d2aa25024af1.zip | |
s2smanager: Generate session names used for logging the same way everywhere
| -rw-r--r-- | core/s2smanager.lua | 2 | ||||
| -rw-r--r-- | core/sessionmanager.lua | 2 | ||||
| -rw-r--r-- | 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; |