aboutsummaryrefslogtreecommitdiffstats
path: root/core/sessionmanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-09-22 01:31:52 +0200
committerKim Alvefur <zash@zash.se>2015-09-22 01:31:52 +0200
commit26574b47a73b824bc0bb1ac28f47de379ac2c64d (patch)
treef6ad57a51df3f189d7ece7f43682e7ccd147537c /core/sessionmanager.lua
parent4c2ff994e81dc411ccaf3288cdd3f5c67a80d035 (diff)
parent4e24283711de37e3db92ebe0f93e26c55d516eda (diff)
downloadprosody-26574b47a73b824bc0bb1ac28f47de379ac2c64d.tar.gz
prosody-26574b47a73b824bc0bb1ac28f47de379ac2c64d.zip
Merge 0.10->trunk
Diffstat (limited to 'core/sessionmanager.lua')
-rw-r--r--core/sessionmanager.lua8
1 files changed, 7 insertions, 1 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 616f38a8..bc4d7cef 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -37,9 +37,15 @@ local function new_session(conn)
if t then
t = filter("bytes/out", tostring(t));
if t then
- return w(conn, t);
+ local ret, err = w(conn, t);
+ if not ret then
+ session.log("error", "Write-error: %s", tostring(err));
+ return false;
+ end
+ return true;
end
end
+ return true;
end
session.ip = conn:ip();
local conn_name = "c2s"..tostring(session):match("[a-f0-9]+$");