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 | 4c01dc18780c4b0b93616093c86b2c9cff3d12f2 (patch) | |
| tree | a1d3fc24abd3048cb23d45b860640a83baa8c261 /core/s2smanager.lua | |
| parent | 8c8ebcc4aeb65184408557a5d3f967dd2b0e7e51 (diff) | |
| parent | 517296667e0fa74dd441892cf9750101ae31e814 (diff) | |
| download | prosody-4c01dc18780c4b0b93616093c86b2c9cff3d12f2.tar.gz prosody-4c01dc18780c4b0b93616093c86b2c9cff3d12f2.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 |