]> git.kaiwu.me - nginx.git/commitdiff
Core: output client port number when logging accept event.
authorRuslan Ermilov <ru@nginx.com>
Wed, 21 May 2014 20:16:09 +0000 (00:16 +0400)
committerRuslan Ermilov <ru@nginx.com>
Wed, 21 May 2014 20:16:09 +0000 (00:16 +0400)
src/event/ngx_event_accept.c

index bf67ecee0624e40982f2768617dac3b7aa8da37e..575ee4bdb03f2bb66d2fa1c43795436e4c788be2 100644 (file)
@@ -288,9 +288,11 @@ ngx_event_accept(ngx_event_t *ev)
 #if (NGX_DEBUG)
         {
 
+        ngx_str_t             addr;
         struct sockaddr_in   *sin;
         ngx_cidr_t           *cidr;
         ngx_uint_t            i;
+        u_char                text[NGX_SOCKADDR_STRLEN];
 #if (NGX_HAVE_INET6)
         struct sockaddr_in6  *sin6;
         ngx_uint_t            n;
@@ -340,11 +342,17 @@ ngx_event_accept(ngx_event_t *ev)
             continue;
         }
 
+        if (log->log_level & NGX_LOG_DEBUG_EVENT) {
+            addr.data = text;
+            addr.len = ngx_sock_ntop(c->sockaddr, c->socklen, text,
+                                     NGX_SOCKADDR_STRLEN, 1);
+
+            ngx_log_debug3(NGX_LOG_DEBUG_EVENT, log, 0,
+                           "*%uA accept: %V fd:%d", c->number, &addr, s);
         }
-#endif
 
-        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, log, 0,
-                       "*%uA accept: %V fd:%d", c->number, &c->addr_text, s);
+        }
+#endif
 
         if (ngx_add_conn && (ngx_event_flags & NGX_USE_EPOLL_EVENT) == 0) {
             if (ngx_add_conn(c) == NGX_ERROR) {