From 87ffa5ec0f9f2860a5ae44342cce3336d4d42561 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 26 Jun 2009 06:32:45 +0100 Subject: xmppclient_listener: Pass session close reason to destroy_session (to be used in unavailable presence) --- net/xmppclient_listener.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'net') diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua index 617f0467..5e1a1ba3 100644 --- a/net/xmppclient_listener.lua +++ b/net/xmppclient_listener.lua @@ -95,7 +95,7 @@ local function session_close(session, reason) end session.send(""); session.conn.close(); - xmppclient.disconnect(session.conn, "stream error"); + xmppclient.disconnect(session.conn, reason.condition or reason or "session closed"); end end @@ -136,7 +136,7 @@ function xmppclient.disconnect(conn, err) local session = sessions[conn]; if session then (session.log or log)("info", "Client disconnected: %s", err); - sm_destroy_session(session); + sm_destroy_session(session, err); sessions[conn] = nil; session = nil; collectgarbage("collect"); -- cgit v1.2.3 From 0e37b231f247e5a7a0f0fb19b7f4239a3a1b3b68 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 28 Jun 2009 14:17:07 +0100 Subject: net.httpserver: Don't upset logger when response is nil --- net/httpserver.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'net') diff --git a/net/httpserver.lua b/net/httpserver.lua index af23a91d..8ce25f35 100644 --- a/net/httpserver.lua +++ b/net/httpserver.lua @@ -52,7 +52,7 @@ local function send_response(request, response) end else -- Response we have is just a string (the body) - log("debug", "Sending response to %s: %s", request.id, response); + log("debug", "Sending response to %s: %s", request.id or "", response or ""); resp = { "HTTP/1.0 200 OK\r\n" }; t_insert(resp, "Connection: close\r\n"); -- cgit v1.2.3