diff options
| author | Kim Alvefur <zash@zash.se> | 2013-02-03 15:52:27 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-02-03 15:52:27 +0100 |
| commit | 1929113b7830954ae60ad49934b3c16bf746a9ba (patch) | |
| tree | a1d3fc24abd3048cb23d45b860640a83baa8c261 /core/s2smanager.lua | |
| parent | 0f2d3d7139c741b6bd8714048694ee16a9b11c91 (diff) | |
| parent | 5cfdac70c61ae6562f72868ef7b55129b166aa80 (diff) | |
| download | prosody-1929113b7830954ae60ad49934b3c16bf746a9ba.tar.gz prosody-1929113b7830954ae60ad49934b3c16bf746a9ba.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core/s2smanager.lua')
| -rw-r--r-- | core/s2smanager.lua | 2 |
1 files changed, 1 insertions, 1 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 |