From 31dd61128403f0af9e2482856ec95d18c85f79d5 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 22 Nov 2009 04:43:46 +0000 Subject: *_listener: Update for new net.server API, specifically .listener -> .onincoming, .disconnect -> .ondisconnect --- net/xmppcomponent_listener.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'net/xmppcomponent_listener.lua') diff --git a/net/xmppcomponent_listener.lua b/net/xmppcomponent_listener.lua index c16f41a0..b353b1b3 100644 --- a/net/xmppcomponent_listener.lua +++ b/net/xmppcomponent_listener.lua @@ -118,12 +118,12 @@ local function session_close(session, reason) end session.send(""); session.conn.close(); - component_listener.disconnect(session.conn, "stream error"); + component_listener.ondisconnect(session.conn, "stream error"); end end --- Component connlistener -function component_listener.listener(conn, data) +function component_listener.onincoming(conn, data) local session = sessions[conn]; if not session then local _send = conn.write; @@ -157,7 +157,7 @@ function component_listener.listener(conn, data) end end -function component_listener.disconnect(conn, err) +function component_listener.ondisconnect(conn, err) local session = sessions[conn]; if session then (session.log or log)("info", "component disconnected: %s (%s)", tostring(session.host), tostring(err)); -- cgit v1.2.3 From 92e03c5a04498c2a0e5df7314f1f10a38331ef68 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 22 Nov 2009 13:47:24 +0000 Subject: xmppcomponent_listener: Use new API for writing to components, fixes traceback (thanks Tobias) --- net/xmppcomponent_listener.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'net/xmppcomponent_listener.lua') diff --git a/net/xmppcomponent_listener.lua b/net/xmppcomponent_listener.lua index b353b1b3..790ab0b7 100644 --- a/net/xmppcomponent_listener.lua +++ b/net/xmppcomponent_listener.lua @@ -127,7 +127,7 @@ function component_listener.onincoming(conn, data) local session = sessions[conn]; if not session then local _send = conn.write; - session = { type = "component", conn = conn, send = function (data) return _send(tostring(data)); end }; + session = { type = "component", conn = conn, send = function (data) return _send(conn, tostring(data)); end }; sessions[conn] = session; -- Logging functions -- -- cgit v1.2.3 From f5afdcb5642fb5260717613cc7909e20805a957c Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 24 Nov 2009 20:34:22 +0000 Subject: core.sessionmanager, net.*_listener: Remove the evil collectgarbage() calls --- net/xmppcomponent_listener.lua | 1 - 1 file changed, 1 deletion(-) (limited to 'net/xmppcomponent_listener.lua') diff --git a/net/xmppcomponent_listener.lua b/net/xmppcomponent_listener.lua index 790ab0b7..4920548d 100644 --- a/net/xmppcomponent_listener.lua +++ b/net/xmppcomponent_listener.lua @@ -169,7 +169,6 @@ function component_listener.ondisconnect(conn, err) sessions[conn] = nil; for k in pairs(session) do session[k] = nil; end session = nil; - collectgarbage("collect"); end end -- cgit v1.2.3