From f1871510b798f5dbe8fa6263fe2e9478c1cdac6d Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 1 Mar 2010 16:45:13 +0000 Subject: net.server_event: Improve and fix potential traceback in logging of new incoming connections --- net/server_event.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'net') diff --git a/net/server_event.lua b/net/server_event.lua index d041ae43..70435f38 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -671,16 +671,16 @@ do debug( "maximal connections reached, refuse client connection; accept delay:", delay ) return EV_TIMEOUT, delay -- delay for next accept attemp end - local ip, port = client:getpeername( ) + local client_ip, client_port = client:getpeername( ) interface._connections = interface._connections + 1 -- increase connection count - local clientinterface = handleclient( client, ip, port, interface, pattern, listener, nil, sslctx ) + local clientinterface = handleclient( client, client_ip, client_port, interface, pattern, listener, nil, sslctx ) --vdebug( "client id:", clientinterface, "startssl:", startssl ) if ssl and sslctx then clientinterface:starttls(sslctx) else clientinterface:_start_session( clientinterface.onconnect ) end - debug( "accepted incoming client connection from:", ip, port ) + debug( "accepted incoming client connection from:", client_ip or "", client_port or "", "to", port or ""); client, err = server:accept() -- try to accept again end -- cgit v1.2.3