diff options
| author | Roman Arutyunyan <arut@nginx.com> | 2020-04-23 18:05:05 +0300 |
|---|---|---|
| committer | Roman Arutyunyan <arut@nginx.com> | 2020-04-23 18:05:05 +0300 |
| commit | 9c375910161cdcac5bb616f6afb8de030849f2ca (patch) | |
| tree | d0d2e02e4584d5a5682b82eeb07d5a597e5d0413 /src | |
| parent | 2e4cd7a2e5f63cf221920ef3462f9c2202e27f7f (diff) | |
| download | nginx-9c375910161cdcac5bb616f6afb8de030849f2ca.tar.gz nginx-9c375910161cdcac5bb616f6afb8de030849f2ca.zip | |
Assign connection number to every QUIC stream log.
Diffstat (limited to 'src')
| -rw-r--r-- | src/event/ngx_event_quic.c | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_request.c | 1 | ||||
| -rw-r--r-- | src/http/v3/ngx_http_v3_streams.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/event/ngx_event_quic.c b/src/event/ngx_event_quic.c index 78af3559f..ef8e237d2 100644 --- a/src/event/ngx_event_quic.c +++ b/src/event/ngx_event_quic.c @@ -2778,6 +2778,8 @@ ngx_quic_create_stream(ngx_connection_t *c, uint64_t id, size_t rcvbuf_size) sn->c->read->log = c->log; sn->c->write->log = c->log; + log->connection = sn->c->number; + cln = ngx_pool_cleanup_add(pool, 0); if (cln == NULL) { ngx_close_connection(sn->c); diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index 082938e00..b0cc9a543 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -438,7 +438,6 @@ ngx_http_quic_stream_handler(ngx_connection_t *c) ctx->request = NULL; ctx->current_request = NULL; - c->log->connection = c->number; c->log->handler = ngx_http_log_error; c->log->data = ctx; c->log->action = "waiting for request"; diff --git a/src/http/v3/ngx_http_v3_streams.c b/src/http/v3/ngx_http_v3_streams.c index 6078725d7..165f21fdc 100644 --- a/src/http/v3/ngx_http_v3_streams.c +++ b/src/http/v3/ngx_http_v3_streams.c @@ -34,8 +34,6 @@ ngx_http_v3_handle_client_uni_stream(ngx_connection_t *c) { ngx_http_v3_uni_stream_t *us; - c->log->connection = c->number; - ngx_http_v3_get_uni_stream(c, NGX_HTTP_V3_STREAM_CONTROL); ngx_http_v3_get_uni_stream(c, NGX_HTTP_V3_STREAM_ENCODER); ngx_http_v3_get_uni_stream(c, NGX_HTTP_V3_STREAM_DECODER); |