aboutsummaryrefslogtreecommitdiffstats
path: root/core/sessionmanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-02-03 15:52:27 +0100
committerKim Alvefur <zash@zash.se>2013-02-03 15:52:27 +0100
commit4c01dc18780c4b0b93616093c86b2c9cff3d12f2 (patch)
treea1d3fc24abd3048cb23d45b860640a83baa8c261 /core/sessionmanager.lua
parent8c8ebcc4aeb65184408557a5d3f967dd2b0e7e51 (diff)
parent517296667e0fa74dd441892cf9750101ae31e814 (diff)
downloadprosody-4c01dc18780c4b0b93616093c86b2c9cff3d12f2.tar.gz
prosody-4c01dc18780c4b0b93616093c86b2c9cff3d12f2.zip
Merge 0.9->trunk
Diffstat (limited to 'core/sessionmanager.lua')
-rw-r--r--core/sessionmanager.lua2
1 files changed, 1 insertions, 1 deletions
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;