Merge 0.10->trunk

[prosody.git] / core / sessionmanager.lua

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index bc4d7cef230b47603a5694cb3384c646120ad6e6..6aa0a4f0f17d147a0b6d2930436ec3b5508084c8 100644 (file)
--- 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;