Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 5475:07dd5bd222ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed resolver API to use ngx_addr_t.
author Ruslan Ermilov <ru@nginx.com>
date Fri, 06 Dec 2013 14:30:27 +0400
parents b7b8e2fa7ebd
children 98876ce2a7fd
comparison
equal deleted inserted replaced
5474:b43b02bb54db 5475:07dd5bd222ac
916 ur->naddrs = ctx->naddrs; 916 ur->naddrs = ctx->naddrs;
917 ur->addrs = ctx->addrs; 917 ur->addrs = ctx->addrs;
918 918
919 #if (NGX_DEBUG) 919 #if (NGX_DEBUG)
920 { 920 {
921 in_addr_t addr; 921 u_char text[NGX_SOCKADDR_STRLEN];
922 ngx_str_t addr;
922 ngx_uint_t i; 923 ngx_uint_t i;
923 924
925 addr.data = text;
926
924 for (i = 0; i < ctx->naddrs; i++) { 927 for (i = 0; i < ctx->naddrs; i++) {
925 addr = ntohl(ur->addrs[i]); 928 addr.len = ngx_sock_ntop(ur->addrs[i].sockaddr, ur->addrs[i].socklen,
926 929 text, NGX_SOCKADDR_STRLEN, 0);
927 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 930
928 "name was resolved to %ud.%ud.%ud.%ud", 931 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
929 (addr >> 24) & 0xff, (addr >> 16) & 0xff, 932 "name was resolved to %V", &addr);
930 (addr >> 8) & 0xff, addr & 0xff);
931 } 933 }
932 } 934 }
933 #endif 935 #endif
934 936
935 if (ngx_http_upstream_create_round_robin_peer(r, ur) != NGX_OK) { 937 if (ngx_http_upstream_create_round_robin_peer(r, ur) != NGX_OK) {