mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-10 19:42:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

HTTP/2: shortened some debug log messages.

Browse Source 
This ensures slightly more readable debug logs on 80-character-wide
terminals.
This commit is contained in:
Maxim Dounin 2017-09-14 19:06:06 +03:00
parent fc1575109e
commit 99cc4c72c7
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/http/v2/ngx_http_v2.c
View File

@ -748,7 +748,7 @@ ngx_http_v2_state_head(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
type = ngx_http_v2_parse_type(head); type = ngx_http_v2_parse_type(head);
ngx_log_debug4(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, ngx_log_debug4(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
"process http2 frame type:%ui f:%Xd l:%uz sid:%ui", "http2 frame type:%ui f:%Xd l:%uz sid:%ui",
type, h2c->state.flags, h2c->state.length, h2c->state.sid); type, h2c->state.flags, h2c->state.length, h2c->state.sid);
if (type >= NGX_HTTP_V2_FRAME_STATES) { if (type >= NGX_HTTP_V2_FRAME_STATES) {
@ -1316,7 +1316,7 @@ ngx_http_v2_state_field_len(ngx_http_v2_connection_t *h2c, u_char *pos,
} }
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
"http2 hpack %s string length: %i", "http2 %s string, len:%i",
huff ? "encoded" : "raw", len); huff ? "encoded" : "raw", len);
h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx, h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
@ -1571,7 +1571,7 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
if (rc == NGX_OK) { if (rc == NGX_OK) {
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http2 pseudo-header: \":%V: %V\"", "http2 header: \":%V: %V\"",
&header->name, &header->value); &header->name, &header->value);
return ngx_http_v2_state_header_complete(h2c, pos, end); return ngx_http_v2_state_header_complete(h2c, pos, end);
@ -1647,7 +1647,7 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
} }
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http2 http header: \"%V: %V\"", "http2 header: \"%V: %V\"",
&header->name, &header->value); &header->name, &header->value);
return ngx_http_v2_state_header_complete(h2c, pos, end); return ngx_http_v2_state_header_complete(h2c, pos, end);
@ -3375,7 +3375,7 @@ ngx_http_v2_construct_request_line(ngx_http_request_t *r)
ngx_memcpy(p, ending, sizeof(ending)); ngx_memcpy(p, ending, sizeof(ending));
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http2 http request line: \"%V\"", &r->request_line); "http2 request line: \"%V\"", &r->request_line);
return NGX_OK; return NGX_OK;
} }

2
src/http/v2/ngx_http_v2_filter_module.c
View File

@ -1269,7 +1269,7 @@ ngx_http_v2_flow_control(ngx_http_v2_connection_t *h2c,
ngx_http_v2_stream_t *stream) ngx_http_v2_stream_t *stream)
{ {
ngx_log_debug3(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, ngx_log_debug3(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
"http2:%ui available windows: conn:%uz stream:%z", "http2:%ui windows: conn:%uz stream:%z",
stream->node->id, h2c->send_window, stream->send_window); stream->node->id, h2c->send_window, stream->send_window);
if (stream->send_window <= 0) { if (stream->send_window <= 0) {

4
src/http/v2/ngx_http_v2_table.c
View File

@ -180,7 +180,7 @@ ngx_http_v2_add_header(ngx_http_v2_connection_t *h2c,
ngx_http_v2_header_t *entry, **entries; ngx_http_v2_header_t *entry, **entries;
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
"http2 add header to hpack table: \"%V: %V\"", "http2 table add: \"%V: %V\"",
&header->name, &header->value); &header->name, &header->value);
if (h2c->hpack.entries == NULL) { if (h2c->hpack.entries == NULL) {
@ -293,7 +293,7 @@ ngx_http_v2_table_account(ngx_http_v2_connection_t *h2c, size_t size)
size += 32; size += 32;
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
"http2 hpack table account: %uz free:%uz", "http2 table account: %uz free:%uz",
size, h2c->hpack.free); size, h2c->hpack.free);
if (size <= h2c->hpack.free) { if (size <= h2c->hpack.free) {