Mercurial > hg > nginx

comparison src/core/ngx_resolver.c @ 1913:c0f873458e2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use cf->cycle->new_log because at merge stage cf->pool->log is old log
author Igor Sysoev <igor@sysoev.ru>
date Tue, 04 Mar 2008 10:42:05 +0000
parents 4a8c9139e579
children d02fb350d17d
comparison
equal deleted inserted replaced
1912:68b426b43c31 1913:c0f873458e2b
90 90
91 91
92 /* STUB: ngx_peer_addr_t * */ 92 /* STUB: ngx_peer_addr_t * */
93 93
94 ngx_resolver_t * 94 ngx_resolver_t *
95 ngx_resolver_create(ngx_pool_t *pool, ngx_peer_addr_t *addr) 95 ngx_resolver_create(ngx_conf_t *cf, ngx_peer_addr_t *addr)
96 { 96 {
97 ngx_resolver_t *r; 97 ngx_resolver_t *r;
98 ngx_pool_cleanup_t *cln; 98 ngx_pool_cleanup_t *cln;
99 ngx_udp_connection_t *uc; 99 ngx_udp_connection_t *uc;
100 100
101 cln = ngx_pool_cleanup_add(pool, 0); 101 cln = ngx_pool_cleanup_add(cf->pool, 0);
102 if (cln == NULL) { 102 if (cln == NULL) {
103 return NULL; 103 return NULL;
104 } 104 }
105 105
106 cln->handler = ngx_resolver_cleanup; 106 cln->handler = ngx_resolver_cleanup;
107 107
108 r = ngx_calloc(sizeof(ngx_resolver_t), pool->log); 108 r = ngx_calloc(sizeof(ngx_resolver_t), cf->log);
109 if (r == NULL) { 109 if (r == NULL) {
110 return NULL; 110 return NULL;
111 } 111 }
112 112
113 cln->data = r; 113 cln->data = r;
114 114
115 r->event = ngx_calloc(sizeof(ngx_event_t), pool->log); 115 r->event = ngx_calloc(sizeof(ngx_event_t), cf->log);
116 if (r->event == NULL) { 116 if (r->event == NULL) {
117 return NULL; 117 return NULL;
118 } 118 }
119 119
120 ngx_rbtree_init(&r->name_rbtree, &r->name_sentinel, 120 ngx_rbtree_init(&r->name_rbtree, &r->name_sentinel,
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 = pool->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 = pool->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), pool->log); 145 uc = ngx_calloc(sizeof(ngx_udp_connection_t), cf->log);
146 if (uc == NULL) { 146 if (uc == NULL) {
147 return NULL; 147 return NULL;
148 } 148 }
149 149
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 = pool->log; 155 uc->log = cf->log;
156 } 156 }
157 157
158 return r; 158 return r;
159 } 159 }
160 160