modulemanager: Reduce warning to debug level message about modules already being...

[prosody.git] / core / sessionmanager.lua

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 131c29f7f14a38feb42f9b4002f66e4a2ac29b37..98ead07fdb2dd50e2172403c6eeec8742db4be0f 100644 (file)
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -6,8 +6,8 @@
 -- COPYING file in the source package for more information.
 --
 
-local tonumber, tostring, setmetatable = tonumber, tostring, setmetatable;
-local ipairs, pairs, print, next= ipairs, pairs, print, next;
+local tostring, setmetatable = tostring, setmetatable;
+local pairs, next= pairs, next;
 
 local hosts = hosts;
 local full_sessions = full_sessions;
@@ -15,7 +15,6 @@ local bare_sessions = bare_sessions;
 
 local logger = require "util.logger";
 local log = logger.init("sessionmanager");
-local error = error;
 local rm_load_roster = require "core.rostermanager".load_roster;
 local config_get = require "core.configmanager".get;
 local resourceprep = require "util.encodings".stringprep.resourceprep;
@@ -23,28 +22,12 @@ local nodeprep = require "util.encodings".stringprep.nodeprep;
 local uuid_generate = require "util.uuid".generate;
 
 local initialize_filters = require "util.filters".initialize;
-local fire_event = prosody.events.fire_event;
-local add_task = require "util.timer".add_task;
 local gettime = require "socket".gettime;
 
-local st = require "util.stanza";
-
-local newproxy = newproxy;
-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: ".. open_sessions);
-       
        local filter = initialize_filters(session);
        local w = conn.write;
        session.send = function (t)
@@ -59,7 +42,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;
@@ -77,7 +60,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
@@ -88,7 +71,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
@@ -145,7 +128,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();
@@ -190,6 +173,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