Merge 0.9->trunk

[prosody.git] / core / sessionmanager.lua

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index d505492e7a30472156a7f9d71948b43ab427b820..d178fb2d684500fcf573bd387243d182d64e98b1 100644 (file)
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -29,17 +29,8 @@ local getmetatable = getmetatable;
 
 module "sessionmanager"
 
-local open_sessions = 0;
-
 function new_session(conn)
        local session = { conn = conn, type = "c2s_unauthed", conntime = gettime() };
-       if true then
-               session.trace = newproxy(true);
-               getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; end;
-       end
-       open_sessions = open_sessions + 1;
-       log("debug", "open sessions now: %d", open_sessions);
-       
        local filter = initialize_filters(session);
        local w = conn.write;
        session.send = function (t)
@@ -54,7 +45,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;
@@ -72,7 +63,7 @@ local resting_session = { -- Resting, not dead
 function retire_session(session)
        local log = session.log or log;
        for k in pairs(session) do
-               if k ~= "trace" and k ~= "log" and k ~= "id" then
+               if k ~= "log" and k ~= "id" then
                        session[k] = nil;
                end
        end
@@ -140,7 +131,7 @@ function bind_resource(session, resource)
                local sessions = hosts[session.host].sessions[session.username].sessions;
                if sessions[resource] then
                        -- Resource conflict
-                       local policy = config_get(session.host, "core", "conflict_resolve");
+                       local policy = config_get(session.host, "conflict_resolve");
                        local increment;
                        if policy == "random" then
                                resource = uuid_generate();