aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-12-15 04:05:49 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-12-15 04:05:49 +0500
commit47045ad74597e770e888e4bddf4db6490d003c34 (patch)
treeb082fd9c59f2b93eb768448f2bd9954d92271189
parent779ccfc391e29a9c5964ef3383f2388a16eac2aa (diff)
downloadprosody-47045ad74597e770e888e4bddf4db6490d003c34.tar.gz
prosody-47045ad74597e770e888e4bddf4db6490d003c34.zip
net.xmppclient_listener: Imports and global cleanup.
-rw-r--r--net/xmppclient_listener.lua13
1 files changed, 5 insertions, 8 deletions
diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index 7cffc0ca..4cc90cbf 100644
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -10,22 +10,19 @@
local logger = require "logger";
local log = logger.init("xmppclient_listener");
-local lxp = require "lxp"
local new_xmpp_stream = require "util.xmppstream".new;
-local sm_new_session = require "core.sessionmanager".new_session;
local connlisteners_register = require "net.connlisteners".register;
-local t_insert = table.insert;
-local t_concat = table.concat;
-local t_concatall = function (t, sep) local tt = {}; for _, s in ipairs(t) do t_insert(tt, tostring(s)); end return t_concat(tt, sep); end
-local m_random = math.random;
-local format = string.format;
local sessionmanager = require "core.sessionmanager";
local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session;
local sm_streamopened = sessionmanager.streamopened;
local sm_streamclosed = sessionmanager.streamclosed;
local st = require "util.stanza";
+local xpcall = xpcall;
+local tostring = tostring;
+local type = type;
+local traceback = debug.traceback;
local config = require "core.configmanager";
local opt_keepalives = config.get("*", "core", "tcp_keepalives");
@@ -62,7 +59,7 @@ function stream_callbacks.error(session, error, data)
end
end
-local function handleerr(err) log("error", "Traceback[c2s]: %s: %s", tostring(err), debug.traceback()); end
+local function handleerr(err) log("error", "Traceback[c2s]: %s: %s", tostring(err), traceback()); end
function stream_callbacks.handlestanza(session, stanza)
stanza = session.filter("stanzas/in", stanza);
if stanza then