diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ngx_connection.h | 11 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.c | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_request.c | 6 | ||||
| -rw-r--r-- | src/http/ngx_http_request.h | 11 | ||||
| -rw-r--r-- | src/stream/ngx_stream.c | 2 | ||||
| -rw-r--r-- | src/stream/ngx_stream.h | 10 | ||||
| -rw-r--r-- | src/stream/ngx_stream_handler.c | 2 |
7 files changed, 17 insertions, 27 deletions
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h index f1ca9619b..27bb8a99c 100644 --- a/src/core/ngx_connection.h +++ b/src/core/ngx_connection.h @@ -190,6 +190,17 @@ struct ngx_connection_s { }; +#define ngx_set_connection_log(c, l) \ + \ + c->log->file = l->file; \ + c->log->next = l->next; \ + c->log->writer = l->writer; \ + c->log->wdata = l->wdata; \ + if (!(c->log->log_level & NGX_LOG_DEBUG_CONNECTION)) { \ + c->log->log_level = l->log_level; \ + } + + ngx_listening_t *ngx_create_listening(ngx_conf_t *cf, void *sockaddr, socklen_t socklen); ngx_int_t ngx_set_inherited_sockets(ngx_cycle_t *cycle); diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 096a561c4..81960414f 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -1445,7 +1445,7 @@ ngx_http_update_location_config(ngx_http_request_t *r) } if (r == r->main) { - ngx_http_set_connection_log(r->connection, clcf->error_log); + ngx_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 a0d75ff87..2669b522c 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -543,7 +543,7 @@ ngx_http_create_request(ngx_connection_t *c) clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); - ngx_http_set_connection_log(r->connection, clcf->error_log); + ngx_set_connection_log(r->connection, clcf->error_log); r->header_in = hc->nbusy ? hc->busy[0] : c->buffer; @@ -867,7 +867,7 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg) clcf = ngx_http_get_module_loc_conf(hc->conf_ctx, ngx_http_core_module); - ngx_http_set_connection_log(c, clcf->error_log); + ngx_set_connection_log(c, clcf->error_log); sscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_ssl_module); @@ -2073,7 +2073,7 @@ ngx_http_set_virtual_server(ngx_http_request_t *r, ngx_str_t *host) clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); - ngx_http_set_connection_log(r->connection, clcf->error_log); + ngx_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 ead4d236f..3954de3f1 100644 --- a/src/http/ngx_http_request.h +++ b/src/http/ngx_http_request.h @@ -586,17 +586,6 @@ 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; \ - c->log->next = l->next; \ - c->log->writer = l->writer; \ - c->log->wdata = l->wdata; \ - if (!(c->log->log_level & NGX_LOG_DEBUG_CONNECTION)) { \ - c->log->log_level = l->log_level; \ - } - - #define ngx_http_set_log_request(log, r) \ ((ngx_http_log_ctx_t *) log->data)->current_request = r diff --git a/src/stream/ngx_stream.c b/src/stream/ngx_stream.c index f982170c1..e5ffcf9bc 100644 --- a/src/stream/ngx_stream.c +++ b/src/stream/ngx_stream.c @@ -370,8 +370,8 @@ ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports) ls->pool_size = 256; cscf = addr->ctx->srv_conf[ngx_stream_core_module.ctx_index]; - ls->logp = cscf->error_log; + ls->logp = cscf->error_log; ls->log.data = &ls->addr_text; ls->log.handler = ngx_accept_log_error; diff --git a/src/stream/ngx_stream.h b/src/stream/ngx_stream.h index 6ac1fd586..83a43a41f 100644 --- a/src/stream/ngx_stream.h +++ b/src/stream/ngx_stream.h @@ -192,16 +192,6 @@ typedef struct { ->main_conf[module.ctx_index]: \ NULL) -#define ngx_stream_set_connection_log(c, l) \ - \ - c->log->file = l->file; \ - c->log->next = l->next; \ - c->log->writer = l->writer; \ - c->log->wdata = l->wdata; \ - if (!(c->log->log_level & NGX_LOG_DEBUG_CONNECTION)) { \ - c->log->log_level = l->log_level; \ - } - void ngx_stream_init_connection(ngx_connection_t *c); void ngx_stream_close_connection(ngx_connection_t *c); diff --git a/src/stream/ngx_stream_handler.c b/src/stream/ngx_stream_handler.c index c05e905c4..2be5183c1 100644 --- a/src/stream/ngx_stream_handler.c +++ b/src/stream/ngx_stream_handler.c @@ -130,7 +130,7 @@ ngx_stream_init_connection(ngx_connection_t *c) cscf = ngx_stream_get_module_srv_conf(s, ngx_stream_core_module); - ngx_stream_set_connection_log(c, cscf->error_log); + ngx_set_connection_log(c, cscf->error_log); len = ngx_sock_ntop(c->sockaddr, c->socklen, text, NGX_SOCKADDR_STRLEN, 1); |