aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-01-24 00:58:17 +0100
committerKim Alvefur <zash@zash.se>2013-01-24 00:58:17 +0100
commit4517552d8ba7d8c57794e2c74c7d73c64cbeb960 (patch)
treeec65141decae5fb7d07319b76bce3ba9b0ddf6c4 /core
parent40709658994b6603968042c9dfebff7363f6ea71 (diff)
downloadprosody-4517552d8ba7d8c57794e2c74c7d73c64cbeb960.tar.gz
prosody-4517552d8ba7d8c57794e2c74c7d73c64cbeb960.zip
s2smanager: Generate session names used for logging the same way everywhere
Diffstat (limited to 'core')
-rw-r--r--core/s2smanager.lua2
-rw-r--r--core/sessionmanager.lua2
2 files changed, 2 insertions, 2 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;