net.server_event: Improve and fix potential traceback in logging of new incoming...
authorMatthew Wild <mwild1@gmail.com>
Mon, 1 Mar 2010 16:45:13 +0000 (16:45 +0000)
committerMatthew Wild <mwild1@gmail.com>
Mon, 1 Mar 2010 16:45:13 +0000 (16:45 +0000)
net/server_event.lua

index d041ae4381527d909ae2b3d2cce63ec420031e4a..70435f38306029c2fe3ae4b0a52990e3d85adde2 100644 (file)
@@ -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 "<unknown IP>", client_port or "<unknown port>", "to", port or "<unknown port>");
                                
                                client, err = server:accept()    -- try to accept again
                        end