mod_s2s: Make sure host variable is reachable

[prosody.git] / core / sessionmanager.lua

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index bd9255a2c7ec4bfe7d1c1fb3b0be8cbfeb9f7ae8..05b2d64b918b12cd40d53908ff4f198fcc03b785 100644 (file)
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -38,7 +38,7 @@ function new_session(conn)
                getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; end;
        end
        open_sessions = open_sessions + 1;
-       log("debug", "open sessions now: ".. open_sessions);
+       log("debug", "open sessions now: %d", open_sessions);
        
        local filter = initialize_filters(session);
        local w = conn.write;
@@ -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;
@@ -83,7 +83,7 @@ function retire_session(session)
 end
 
 function destroy_session(session, err)
-       (session.log or log)("info", "Destroying session for %s (%s@%s)%s", session.full_jid or "(unknown)", session.username or "(unknown)", session.host or "(unknown)", err and (": "..err) or "");
+       (session.log or log)("debug", "Destroying session for %s (%s@%s)%s", session.full_jid or "(unknown)", session.username or "(unknown)", session.host or "(unknown)", err and (": "..err) or "");
        if session.destroyed then return; end
        
        -- Remove session/resource from user's session list
@@ -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