Stream: additional logging for UDP.

This commit is contained in:
Vladimir Homutov 2016-03-18 19:53:22 +03:00
parent 2e6e246794
commit 818ebb3492
2 changed files with 10 additions and 5 deletions

View File

@ -137,8 +137,9 @@ ngx_stream_init_connection(ngx_connection_t *c)
len = ngx_sock_ntop(c->sockaddr, c->socklen, text, NGX_SOCKADDR_STRLEN, 1);
ngx_log_error(NGX_LOG_INFO, c->log, 0, "*%uA client %*s connected to %V",
c->number, len, text, &addr_conf->addr_text);
ngx_log_error(NGX_LOG_INFO, c->log, 0, "*%uA %sclient %*s connected to %V",
c->number, c->type == SOCK_DGRAM ? "udp " : "",
len, text, &addr_conf->addr_text);
c->log->connection = c->number;
c->log->handler = ngx_stream_log_error;
@ -328,7 +329,8 @@ ngx_stream_log_error(ngx_log_t *log, u_char *buf, size_t len)
s = log->data;
p = ngx_snprintf(buf, len, ", client: %V, server: %V",
p = ngx_snprintf(buf, len, ", %sclient: %V, server: %V",
s->connection->type == SOCK_DGRAM ? "udp " : "",
&s->connection->addr_text,
&s->connection->listening->addr_text);
len -= p - buf;

View File

@ -552,7 +552,9 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
handler = c->log->handler;
c->log->handler = NULL;
ngx_log_error(NGX_LOG_INFO, c->log, 0, "proxy %V connected to %V",
ngx_log_error(NGX_LOG_INFO, c->log, 0,
"%sproxy %V connected to %V",
pc->type == SOCK_DGRAM ? "udp " : "",
&str, u->peer.name);
c->log->handler = handler;
@ -1222,9 +1224,10 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
c->log->handler = NULL;
ngx_log_error(NGX_LOG_INFO, c->log, 0,
"%s disconnected"
"%s%s disconnected"
", bytes from/to client:%O/%O"
", bytes from/to upstream:%O/%O",
src->type == SOCK_DGRAM ? "udp " : "",
from_upstream ? "upstream" : "client",
s->received, c->sent, u->received, pc ? pc->sent : 0);