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

Fixed logging with variable field width.

Browse Source
This commit is contained in:
Sergey Kandaurov 2016-03-31 02:33:53 +03:00
parent 2e25f340b8
commit c622ff3b44
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/ngx_resolver.c
View File

@ -1873,7 +1873,7 @@ dns_error_name:
ngx_log_error(r->log_level, r->log, 0, ngx_log_error(r->log_level, r->log, 0,
"DNS error (%ui: %s), query id:%ui, name:\"%*s\"", "DNS error (%ui: %s), query id:%ui, name:\"%*s\"",
code, ngx_resolver_strerror(code), ident, code, ngx_resolver_strerror(code), ident,
rn->nlen, rn->name); (size_t) rn->nlen, rn->name);
return; return;
dns_error: dns_error:

4
src/http/modules/ngx_http_mp4_module.c
View File

@ -913,7 +913,7 @@ ngx_http_mp4_read_atom(ngx_http_mp4_file_t *mp4,
ngx_log_debug4(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, ngx_log_debug4(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
"mp4 atom: %*s @%O:%uL", "mp4 atom: %*s @%O:%uL",
4, atom_name, mp4->offset, atom_size); (size_t) 4, atom_name, mp4->offset, atom_size);
if (atom_size > (uint64_t) (NGX_MAX_OFF_T_VALUE - mp4->offset) if (atom_size > (uint64_t) (NGX_MAX_OFF_T_VALUE - mp4->offset)
|| mp4->offset + (off_t) atom_size > end) || mp4->offset + (off_t) atom_size > end)
@ -1958,7 +1958,7 @@ ngx_http_mp4_read_stsd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
"stsd entries:%uD, media:%*s", "stsd entries:%uD, media:%*s",
ngx_mp4_get_32value(stsd_atom->entries), ngx_mp4_get_32value(stsd_atom->entries),
4, stsd_atom->media_name); (size_t) 4, stsd_atom->media_name);
trak = ngx_mp4_last_trak(mp4); trak = ngx_mp4_last_trak(mp4);

5
src/http/modules/ngx_http_ssl_module.c
View File

@ -338,7 +338,8 @@ ngx_http_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out,
#if (NGX_DEBUG) #if (NGX_DEBUG)
for (i = 0; i < inlen; i += in[i] + 1) { for (i = 0; i < inlen; i += in[i] + 1) {
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
"SSL ALPN supported by client: %*s", in[i], &in[i + 1]); "SSL ALPN supported by client: %*s",
(size_t) in[i], &in[i + 1]);
} }
#endif #endif
@ -365,7 +366,7 @@ ngx_http_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out,
} }
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
"SSL ALPN selected: %*s", *outlen, *out); "SSL ALPN selected: %*s", (size_t) *outlen, *out);
return SSL_TLSEXT_ERR_OK; return SSL_TLSEXT_ERR_OK;
} }

3
src/http/ngx_http_core_module.c
View File

@ -1597,7 +1597,8 @@ ngx_http_core_find_static_location(ngx_http_request_t *r,
} }
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"test location: \"%*s\"", node->len, node->name); "test location: \"%*s\"",
(size_t) node->len, node->name);
n = (len <= (size_t) node->len) ? len : node->len; n = (len <= (size_t) node->len) ? len : node->len;

2
src/http/ngx_http_file_cache.c
View File

@ -1834,7 +1834,7 @@ ngx_http_file_cache_expire(ngx_http_file_cache_t *cache)
ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
"ignore long locked inactive cache entry %*s, count:%d", "ignore long locked inactive cache entry %*s, count:%d",
2 * NGX_HTTP_CACHE_KEY_LEN, key, fcn->count); (size_t) 2 * NGX_HTTP_CACHE_KEY_LEN, key, fcn->count);
} }
ngx_shmtx_unlock(&cache->shpool->mutex); ngx_shmtx_unlock(&cache->shpool->mutex);

5
src/http/ngx_http_variables.c
View File

@ -2428,9 +2428,8 @@ ngx_http_regex_exec(ngx_http_request_t *r, ngx_http_regex_t *re, ngx_str_t *s)
v = cmcf->variables.elts; v = cmcf->variables.elts;
ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http regex set $%V to \"%*s\"", "http regex set $%V to \"%v\"", &v[index].name, vv);
&v[index].name, vv->len, vv->data);
} }
#endif #endif
} }