mod_s2s: Make sure host variable is reachable

[prosody.git] / core / sessionmanager.lua

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 6945b8de61a2b187ff46d1dedfd2876c4dfa170c..05b2d64b918b12cd40d53908ff4f198fcc03b785 100644 (file)
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -54,7 +54,7 @@ function new_session(conn)
                end
        end
        session.ip = conn:ip();
-       local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$");
+       local conn_name = "c2s"..tostring(session):match("[a-f0-9]+$");
        session.log = logger.init(conn_name);
                
        return session;
@@ -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