aboutsummaryrefslogtreecommitdiffstats
path: root/core/sessionmanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-11-09 22:56:32 +0100
committerKim Alvefur <zash@zash.se>2015-11-09 22:56:32 +0100
commitdd417c0f4a850be9280c2589f0a582aa0d7d566d (patch)
tree3e6fc617741dec52b661ba121b7949d6b284399d /core/sessionmanager.lua
parent1407c9f7a72c9e27efb9983554e7579d157aecc6 (diff)
parent5d077a0c17dbe89c2481cdebd18f4051dd2d10ae (diff)
downloadprosody-dd417c0f4a850be9280c2589f0a582aa0d7d566d.tar.gz
prosody-dd417c0f4a850be9280c2589f0a582aa0d7d566d.zip
Merge 0.10->trunk
Diffstat (limited to 'core/sessionmanager.lua')
-rw-r--r--core/sessionmanager.lua5
1 files changed, 2 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;