Mercurial > hg > nginx
comparison src/core/ngx_resolver.c @ 2785:d478379e51ac
*) refactor error_log processing: listen socket log might inherit built-in
error_log with zero level, and r2447, r2466, r2467 were not enough
*) remove bogus "stderr" level
*) some functions and fields renames
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 30 Apr 2009 13:53:42 +0000 |
parents | 1c87647b7ca5 |
children | 5f6144fc674d 11ec1c7a57e9 |
comparison
equal
deleted
inserted
replaced
2784:c2230102df6f | 2785:d478379e51ac |
---|---|
129 ngx_queue_init(&r->name_expire_queue); | 129 ngx_queue_init(&r->name_expire_queue); |
130 ngx_queue_init(&r->addr_expire_queue); | 130 ngx_queue_init(&r->addr_expire_queue); |
131 | 131 |
132 r->event->handler = ngx_resolver_resend_handler; | 132 r->event->handler = ngx_resolver_resend_handler; |
133 r->event->data = r; | 133 r->event->data = r; |
134 r->event->log = cf->cycle->new_log; | 134 r->event->log = &cf->cycle->new_log; |
135 r->ident = -1; | 135 r->ident = -1; |
136 | 136 |
137 r->resend_timeout = 5; | 137 r->resend_timeout = 5; |
138 r->expire = 30; | 138 r->expire = 30; |
139 r->valid = 300; | 139 r->valid = 300; |
140 | 140 |
141 r->log = cf->cycle->new_log; | 141 r->log = &cf->cycle->new_log; |
142 r->log_level = NGX_LOG_ALERT; | 142 r->log_level = NGX_LOG_ALERT; |
143 | 143 |
144 if (addr) { | 144 if (addr) { |
145 uc = ngx_calloc(sizeof(ngx_udp_connection_t), cf->log); | 145 uc = ngx_calloc(sizeof(ngx_udp_connection_t), cf->log); |
146 if (uc == NULL) { | 146 if (uc == NULL) { |
150 r->udp_connection = uc; | 150 r->udp_connection = uc; |
151 | 151 |
152 uc->sockaddr = addr->sockaddr; | 152 uc->sockaddr = addr->sockaddr; |
153 uc->socklen = addr->socklen; | 153 uc->socklen = addr->socklen; |
154 uc->server = addr->name; | 154 uc->server = addr->name; |
155 uc->log = cf->cycle->new_log; | 155 uc->log = &cf->cycle->new_log; |
156 } | 156 } |
157 | 157 |
158 return r; | 158 return r; |
159 } | 159 } |
160 | 160 |