diff options
| author | Kim Alvefur <zash@zash.se> | 2019-11-16 16:52:31 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-11-16 16:52:31 +0100 |
| commit | 908f5b61c55e4cba39e61ac415b0fca384a1095d (patch) | |
| tree | 6e391ff6608608f181e42c92ee6dfd7c534da255 /util/session.lua | |
| parent | c4c38d2f01d5f2711b527c7c2412250ed6c58738 (diff) | |
| parent | fd9ccf20d5b652dbad1f37cecd540661f4642ee6 (diff) | |
| download | prosody-908f5b61c55e4cba39e61ac415b0fca384a1095d.tar.gz prosody-908f5b61c55e4cba39e61ac415b0fca384a1095d.zip | |
Merge 0.11->trunk
Diffstat (limited to 'util/session.lua')
| -rw-r--r-- | util/session.lua | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/util/session.lua b/util/session.lua index b2a726ce..25b22faf 100644 --- a/util/session.lua +++ b/util/session.lua @@ -4,12 +4,13 @@ local logger = require "util.logger"; local function new_session(typ) local session = { type = typ .. "_unauthed"; + base_type = typ; }; return session; end local function set_id(session) - local id = session.type .. tostring(session):match("%x+$"):lower(); + local id = session.base_type .. tostring(session):match("%x+$"):lower(); session.id = id; return session; end @@ -30,7 +31,7 @@ local function set_send(session) local conn = session.conn; if not conn then function session.send(data) - session.log("debug", "Discarding data sent to unconnected session: %s", tostring(data)); + session.log("debug", "Discarding data sent to unconnected session: %s", data); return false; end return session; @@ -46,7 +47,7 @@ local function set_send(session) if t then local ret, err = w(conn, t); if not ret then - session.log("debug", "Error writing to connection: %s", tostring(err)); + session.log("debug", "Error writing to connection: %s", err); return false, err; end end |