diff options
author | Kim Alvefur <zash@zash.se> | 2015-11-09 22:56:32 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-11-09 22:56:32 +0100 |
commit | 094164e5f0bf835e4fd1dcefa57f3bb4add8325d (patch) | |
tree | 3e6fc617741dec52b661ba121b7949d6b284399d /core | |
parent | 1173ee03d3daede409447b6eb049c1ca06145f50 (diff) | |
parent | 57fe905a8c3eeffb507a0967512a4caccb0e882b (diff) | |
download | prosody-094164e5f0bf835e4fd1dcefa57f3bb4add8325d.tar.gz prosody-094164e5f0bf835e4fd1dcefa57f3bb4add8325d.zip |
Merge 0.10->trunk
Diffstat (limited to 'core')
-rw-r--r-- | core/sessionmanager.lua | 5 | ||||
-rw-r--r-- | core/statsmanager.lua | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index bc4d7cef..6aa0a4f0 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -39,10 +39,9 @@ local function new_session(conn) if t then local ret, err = w(conn, t); if not ret then - session.log("error", "Write-error: %s", tostring(err)); - return false; + session.log("debug", "Error writing to connection: %s", tostring(err)); + return false, err; end - return true; end end return true; diff --git a/core/statsmanager.lua b/core/statsmanager.lua index d6cbd2bc..7771a2b3 100644 --- a/core/statsmanager.lua +++ b/core/statsmanager.lua @@ -66,4 +66,7 @@ return { get_stats = function () return latest_stats, changed_stats, stats_extra; end; + get = function (name) + return latest_stats[name], stats_extra[name]; + end; }; |