mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-12 21:52:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor log_subrequest

Browse Source
This commit is contained in:
Igor Sysoev 2008-09-29 13:18:41 +00:00
parent 5d1dcce2c5
commit eb62fa0e73
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/http/ngx_http_request.c
View File

@ -1760,6 +1760,17 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
return; return;
} }
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
if (r != r->main && !r->logged) {
if (clcf->log_subrequest) {
ngx_http_log_request(r);
}
r->logged = 1;
}
if (r != r->main || rc == NGX_AGAIN) { if (r != r->main || rc == NGX_AGAIN) {
if (ngx_http_set_write_handler(r) != NGX_OK) { if (ngx_http_set_write_handler(r) != NGX_OK) {
return; return;
@ -1775,8 +1786,6 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
return; return;
} }
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
if (r != r->main) { if (r != r->main) {
pr = r->parent; pr = r->parent;
@ -1810,11 +1819,6 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http fast subrequest: \"%V?%V\" done", "http fast subrequest: \"%V?%V\" done",
&r->uri, &r->args); &r->uri, &r->args);
if (clcf->log_subrequest) {
ngx_http_log_request(r);
}
return; return;
} }
@ -1823,18 +1827,8 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
"http wake parent request: \"%V?%V\"", "http wake parent request: \"%V?%V\"",
&pr->uri, &pr->args); &pr->uri, &pr->args);
if (clcf->log_subrequest) {
ngx_http_log_request(r);
}
pr->write_event_handler(pr); pr->write_event_handler(pr);
} }
return;
}
if (clcf->log_subrequest) {
ngx_http_log_request(r);
} }
return; return;

1
src/http/ngx_http_request.h
View File

@ -464,6 +464,7 @@ struct ngx_http_request_s {
unsigned expect_tested:1; unsigned expect_tested:1;
unsigned root_tested:1; unsigned root_tested:1;
unsigned done:1; unsigned done:1;
unsigned logged:1;
unsigned utf8:1; unsigned utf8:1;
unsigned buffered:4; unsigned buffered:4;