diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-12-05 19:49:16 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-12-05 19:49:16 +0000 |
| commit | c016526d9d5b57c8b6157cba7eee4bb268e1e9b4 (patch) | |
| tree | 9a0fe48f76564edcc95b6dad8ddcef79d4a8f85b /core/sessionmanager.lua | |
| parent | 0d2b952b610069996f733700117a2e62d5b73696 (diff) | |
| download | prosody-c016526d9d5b57c8b6157cba7eee4bb268e1e9b4.tar.gz prosody-c016526d9d5b57c8b6157cba7eee4bb268e1e9b4.zip | |
Backed out changeset 099d8a102deb (committed too much)
Diffstat (limited to 'core/sessionmanager.lua')
| -rw-r--r-- | core/sessionmanager.lua | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index bc48d228..36111633 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -35,8 +35,6 @@ local uuid_generate = require "util.uuid".generate; local rm_load_roster = require "core.rostermanager".load_roster; local config_get = require "core.configmanager".get; -local gettime = require "socket".gettime; - local st = require "util.stanza"; local newproxy = newproxy; @@ -47,7 +45,7 @@ module "sessionmanager" local open_sessions = 0; function new_session(conn) - local session = { conn = conn, priority = 0, type = "c2s_unauthed", conntime = gettime() }; + local session = { conn = conn, priority = 0, type = "c2s_unauthed" }; if true then session.trace = newproxy(true); getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; print("Session got collected, now "..open_sessions.." sessions are allocated") end; @@ -111,8 +109,6 @@ function bind_resource(session, resource) if session.resource then return nil, "cancel", "already-bound", "Cannot bind multiple resources on a single connection"; end -- We don't support binding multiple resources - session.conntimetotal = gettime()-session.conntime; - resource = resource or uuid_generate(); --FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing |