diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2013-02-27 16:56:47 +0000 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2013-02-27 16:56:47 +0000 |
| commit | b314102ff14f0c809db43bebd1ff75ceeb7769a9 (patch) | |
| tree | 0a1011807717d67afdd18bc711276fc6863f9666 /src | |
| parent | 508afb8cf504cf4ee77dfa69b75a93ac259817c2 (diff) | |
| download | nginx-b314102ff14f0c809db43bebd1ff75ceeb7769a9.tar.gz nginx-b314102ff14f0c809db43bebd1ff75ceeb7769a9.zip | |
Introduced the ngx_http_set_connection_log() macro.
No functional changes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 6 | ||||
| -rw-r--r-- | src/http/ngx_http_request.c | 11 | ||||
| -rw-r--r-- | src/http/ngx_http_request.h | 8 |
3 files changed, 12 insertions, 13 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 16e6ddb5d..c4914997b 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -1461,11 +1461,7 @@ ngx_http_update_location_config(ngx_http_request_t *r) } if (r == r->main) { - r->connection->log->file = clcf->error_log->file; - - if (!(r->connection->log->log_level & NGX_LOG_DEBUG_CONNECTION)) { - r->connection->log->log_level = clcf->error_log->log_level; - } + ngx_http_set_connection_log(r->connection, clcf->error_log); } if ((ngx_io.flags & NGX_IO_SENDFILE) && clcf->sendfile) { diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index c1ee921fc..9b66718a2 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -443,10 +443,8 @@ ngx_http_init_request(ngx_event_t *rev) #endif clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); - c->log->file = clcf->error_log->file; - if (!(c->log->log_level & NGX_LOG_DEBUG_CONNECTION)) { - c->log->log_level = clcf->error_log->log_level; - } + + ngx_http_set_connection_log(r->connection, clcf->error_log); if (c->buffer == NULL) { c->buffer = ngx_create_temp_buf(c->pool, @@ -1852,11 +1850,8 @@ found: r->loc_conf = cscf->ctx->loc_conf; clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); - r->connection->log->file = clcf->error_log->file; - if (!(r->connection->log->log_level & NGX_LOG_DEBUG_CONNECTION)) { - r->connection->log->log_level = clcf->error_log->log_level; - } + ngx_http_set_connection_log(r->connection, clcf->error_log); return NGX_OK; } diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h index d7d076083..7ceea6225 100644 --- a/src/http/ngx_http_request.h +++ b/src/http/ngx_http_request.h @@ -571,4 +571,12 @@ extern ngx_http_header_t ngx_http_headers_in[]; extern ngx_http_header_out_t ngx_http_headers_out[]; +#define ngx_http_set_connection_log(c, l) \ + \ + c->log->file = l->file; \ + if (!(c->log->log_level & NGX_LOG_DEBUG_CONNECTION)) { \ + c->log->log_level = l->log_level; \ + } + + #endif /* _NGX_HTTP_REQUEST_H_INCLUDED_ */ |