diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2012-12-01 00:31:33 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2012-12-01 00:31:33 +0500 |
| commit | f2f277328207d92db9439ad2a31125dad55cf7ca (patch) | |
| tree | 74e490c3a2d4ca6afc659fd9a071309b2c7a8cc4 /core | |
| parent | 315ee9ae46b649074ce44e9cdab14866627ee45c (diff) | |
| parent | 55bd98c887050629202fc5b21a06749a743f0fc5 (diff) | |
| download | prosody-f2f277328207d92db9439ad2a31125dad55cf7ca.tar.gz prosody-f2f277328207d92db9439ad2a31125dad55cf7ca.zip | |
Merge 0.9->trunk.
Diffstat (limited to 'core')
| -rw-r--r-- | core/sessionmanager.lua | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index 6945b8de..d505492e 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -185,6 +185,7 @@ function bind_resource(session, resource) bare_sessions[session.username..'@'..session.host] = nil; hosts[session.host].sessions[session.username] = nil; end + session.log("error", "Roster loading failed: %s", err); return nil, "cancel", "internal-server-error", "Error loading roster"; end |