aboutsummaryrefslogtreecommitdiffstats
path: root/util/session.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-22 18:46:59 +0100
committerKim Alvefur <zash@zash.se>2016-02-22 18:46:59 +0100
commit9dd235d53bbb77efa67543e0057d093789ca2ddd (patch)
tree15d7151c2609ac821e0dd08e27f67795300b090d /util/session.lua
parentcccb4ab09be9573c02e0d2684e062363cd7eb068 (diff)
parented8199402ff2a84e57f256818ebc2c505c2ac41d (diff)
downloadprosody-9dd235d53bbb77efa67543e0057d093789ca2ddd.tar.gz
prosody-9dd235d53bbb77efa67543e0057d093789ca2ddd.zip
Merge 0.10->trunk
Diffstat (limited to 'util/session.lua')
-rw-r--r--util/session.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/util/session.lua b/util/session.lua
index fda7fccd..b2a726ce 100644
--- a/util/session.lua
+++ b/util/session.lua
@@ -9,13 +9,13 @@ local function new_session(typ)
end
local function set_id(session)
- local id = typ .. tostring(session):match("%x+$"):lower();
+ local id = session.type .. tostring(session):match("%x+$"):lower();
session.id = id;
return session;
end
local function set_logger(session)
- local log = logger.init(id);
+ local log = logger.init(session.id);
session.log = log;
return session;
end
@@ -30,7 +30,7 @@ local function set_send(session)
local conn = session.conn;
if not conn then
function session.send(data)
- log("debug", "Discarding data sent to unconnected session: %s", tostring(data));
+ session.log("debug", "Discarding data sent to unconnected session: %s", tostring(data));
return false;
end
return session;