mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-24 04:11:02 +01:00
Code Issues Projects Releases Wiki Activity

[MINOR] Manage unix socket source field on logs

Browse Source
This commit is contained in:
Emeric Brun 2010-10-22 16:14:31 +02:00 committed by Willy Tarreau
parent cf20bf1c1c
commit 4ab9262894
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/log.c
View File

@ -335,7 +335,7 @@ void tcp_sess_log(struct session *s)
inet_ntop(AF_INET, inet_ntop(AF_INET,
(const void *)&((struct sockaddr_in *)&s->cli_addr)->sin_addr, (const void *)&((struct sockaddr_in *)&s->cli_addr)->sin_addr,
pn, sizeof(pn)); pn, sizeof(pn));
else else if (s->cli_addr.ss_family == AF_INET6)
inet_ntop(AF_INET6, inet_ntop(AF_INET6,
(const void *)&((struct sockaddr_in6 *)(&s->cli_addr))->sin6_addr, (const void *)&((struct sockaddr_in6 *)(&s->cli_addr))->sin6_addr,
pn, sizeof(pn)); pn, sizeof(pn));
@ -356,10 +356,10 @@ void tcp_sess_log(struct session *s)
send_log(prx_log, level, "%s:%d [%02d/%s/%04d:%02d:%02d:%02d.%03d]" send_log(prx_log, level, "%s:%d [%02d/%s/%04d:%02d:%02d:%02d.%03d]"
" %s %s/%s %ld/%ld/%s%ld %s%lld" " %s %s/%s %ld/%ld/%s%ld %s%lld"
" %c%c %d/%d/%d/%d/%s%u %ld/%ld\n", " %c%c %d/%d/%d/%d/%s%u %ld/%ld\n",
pn, s->cli_addr.ss_family == AF_UNIX ? "unix" : pn,
(s->cli_addr.ss_family == AF_INET) ? s->cli_addr.ss_family == AF_UNIX ? s->listener->luid : (ntohs((s->cli_addr.ss_family == AF_INET) ?
ntohs(((struct sockaddr_in *)&s->cli_addr)->sin_port) : ((struct sockaddr_in *)&s->cli_addr)->sin_port :
ntohs(((struct sockaddr_in6 *)&s->cli_addr)->sin6_port), ((struct sockaddr_in6 *)&s->cli_addr)->sin6_port)),
tm.tm_mday, monthname[tm.tm_mon], tm.tm_year+1900, tm.tm_mday, monthname[tm.tm_mon], tm.tm_year+1900,
tm.tm_hour, tm.tm_min, tm.tm_sec, (int)s->logs.tv_accept.tv_usec/1000, tm.tm_hour, tm.tm_min, tm.tm_sec, (int)s->logs.tv_accept.tv_usec/1000,
fe->id, be->id, svid, fe->id, be->id, svid,