Software /
code /
prosody
Comparison
core/sessionmanager.lua @ 6920:7596c37e0a63
Merge 0.10->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Mon, 09 Nov 2015 22:56:32 +0100 |
parent | 6916:d0ab0069145f |
child | 7284:9434a220e549 |
comparison
equal
deleted
inserted
replaced
6909:494938dec5d8 | 6920:7596c37e0a63 |
---|---|
37 if t then | 37 if t then |
38 t = filter("bytes/out", tostring(t)); | 38 t = filter("bytes/out", tostring(t)); |
39 if t then | 39 if t then |
40 local ret, err = w(conn, t); | 40 local ret, err = w(conn, t); |
41 if not ret then | 41 if not ret then |
42 session.log("error", "Write-error: %s", tostring(err)); | 42 session.log("debug", "Error writing to connection: %s", tostring(err)); |
43 return false; | 43 return false, err; |
44 end | 44 end |
45 return true; | |
46 end | 45 end |
47 end | 46 end |
48 return true; | 47 return true; |
49 end | 48 end |
50 session.ip = conn:ip(); | 49 session.ip = conn:ip(); |