diff options
| author | Kim Alvefur <zash@zash.se> | 2016-02-22 18:46:59 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-02-22 18:46:59 +0100 |
| commit | 349f3e7a755249a16acf5417f9bea95c0df77513 (patch) | |
| tree | 15d7151c2609ac821e0dd08e27f67795300b090d /util/session.lua | |
| parent | 82a913c6816be2b0503368afac85b8b20335db0e (diff) | |
| parent | 6ee4f6f618ee4a07f3b25f38c7da675d68fdceee (diff) | |
| download | prosody-349f3e7a755249a16acf5417f9bea95c0df77513.tar.gz prosody-349f3e7a755249a16acf5417f9bea95c0df77513.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util/session.lua')
| -rw-r--r-- | util/session.lua | 6 |
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; |