diff options
author | Igor Sysoev <igor@sysoev.ru> | 2009-04-30 13:53:42 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2009-04-30 13:53:42 +0000 |
commit | 0cd76ea2902588a7f3baea47407c48956aaa19e6 (patch) | |
tree | 34e7bfe5726c80f084bd6a7f04a3d40b3e0cb877 /src/core/ngx_resolver.c | |
parent | 06d4aa1883034b6117a29887bc90a74ae433f3fd (diff) | |
download | nginx-0cd76ea2902588a7f3baea47407c48956aaa19e6.tar.gz nginx-0cd76ea2902588a7f3baea47407c48956aaa19e6.zip |
*) 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
Diffstat (limited to 'src/core/ngx_resolver.c')
-rw-r--r-- | src/core/ngx_resolver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c index f58fb5ba7..2b53ee07e 100644 --- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c @@ -131,14 +131,14 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_peer_addr_t *addr) r->event->handler = ngx_resolver_resend_handler; r->event->data = r; - r->event->log = cf->cycle->new_log; + r->event->log = &cf->cycle->new_log; r->ident = -1; r->resend_timeout = 5; r->expire = 30; r->valid = 300; - r->log = cf->cycle->new_log; + r->log = &cf->cycle->new_log; r->log_level = NGX_LOG_ALERT; if (addr) { @@ -152,7 +152,7 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_peer_addr_t *addr) uc->sockaddr = addr->sockaddr; uc->socklen = addr->socklen; uc->server = addr->name; - uc->log = cf->cycle->new_log; + uc->log = &cf->cycle->new_log; } return r; |