Mercurial > prosody-hg
comparison core/sessionmanager.lua @ 4970:eeff01224865
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 22 Jul 2012 17:08:09 +0100 |
| parents | 29b24a4028ed |
| children | 95c18750b89e |
comparison
equal
deleted
inserted
replaced
| 4958:1f1c74ac9666 | 4970:eeff01224865 |
|---|---|
| 80 if k ~= "trace" and k ~= "log" and k ~= "id" then | 80 if k ~= "trace" and k ~= "log" and k ~= "id" then |
| 81 session[k] = nil; | 81 session[k] = nil; |
| 82 end | 82 end |
| 83 end | 83 end |
| 84 | 84 |
| 85 function session.send(data) log("debug", "Discarding data sent to resting session: %s", tostring(data)); end | 85 function session.send(data) log("debug", "Discarding data sent to resting session: %s", tostring(data)); return false; end |
| 86 function session.data(data) log("debug", "Discarding data received from resting session: %s", tostring(data)); end | 86 function session.data(data) log("debug", "Discarding data received from resting session: %s", tostring(data)); end |
| 87 return setmetatable(session, resting_session); | 87 return setmetatable(session, resting_session); |
| 88 end | 88 end |
| 89 | 89 |
| 90 function destroy_session(session, err) | 90 function destroy_session(session, err) |
