aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-01 16:45:13 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-01 16:45:13 +0000
commitf1871510b798f5dbe8fa6263fe2e9478c1cdac6d (patch)
treeab38dec252dbf18ca77f64006af9e963f0c92419
parentbd1934e306403d34aec93682f290fd06c0784348 (diff)
downloadprosody-f1871510b798f5dbe8fa6263fe2e9478c1cdac6d.tar.gz
prosody-f1871510b798f5dbe8fa6263fe2e9478c1cdac6d.zip
net.server_event: Improve and fix potential traceback in logging of new incoming connections
-rw-r--r--net/server_event.lua6
1 files changed, 3 insertions, 3 deletions
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 "<unknown IP>", client_port or "<unknown port>", "to", port or "<unknown port>");
client, err = server:accept() -- try to accept again
end