mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-10 09:07:02 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: log: Always access the stream-int via the conn-stream

Browse Source 
To be able to move the stream-interface from the stream to the conn-stream,
all access to the SI is done via the conn-stream. This patch is limited to
the log part.
This commit is contained in:
Christopher Faulet 2021-12-23 13:32:42 +01:00
parent 0c247df38b
commit 02fc86e8f6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/log.c
View File

@ -2102,7 +2102,7 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
break; break;
case LOG_FMT_CLIENTIP: // %ci case LOG_FMT_CLIENTIP: // %ci
addr = (s ? si_src(&s->si[0]) : sess_src(sess)); addr = (s ? si_src(cs_si(s->csf)) : sess_src(sess));
if (addr) if (addr)
ret = lf_ip(tmplog, (struct sockaddr *)addr, dst + maxsize - tmplog, tmp); ret = lf_ip(tmplog, (struct sockaddr *)addr, dst + maxsize - tmplog, tmp);
else else
@ -2115,7 +2115,7 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
break; break;
case LOG_FMT_CLIENTPORT: // %cp case LOG_FMT_CLIENTPORT: // %cp
addr = (s ? si_src(&s->si[0]) : sess_src(sess)); addr = (s ? si_src(cs_si(s->csf)) : sess_src(sess));
if (addr) { if (addr) {
/* sess->listener is always defined when the session's owner is an inbound connections */ /* sess->listener is always defined when the session's owner is an inbound connections */
if (addr->ss_family == AF_UNIX) if (addr->ss_family == AF_UNIX)
@ -2133,7 +2133,7 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
break; break;
case LOG_FMT_FRONTENDIP: // %fi case LOG_FMT_FRONTENDIP: // %fi
addr = (s ? si_dst(&s->si[0]) : sess_dst(sess)); addr = (s ? si_dst(cs_si(s->csf)) : sess_dst(sess));
if (addr) if (addr)
ret = lf_ip(tmplog, (struct sockaddr *)addr, dst + maxsize - tmplog, tmp); ret = lf_ip(tmplog, (struct sockaddr *)addr, dst + maxsize - tmplog, tmp);
else else
@ -2146,7 +2146,7 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
break; break;
case LOG_FMT_FRONTENDPORT: // %fp case LOG_FMT_FRONTENDPORT: // %fp
addr = (s ? si_dst(&s->si[0]) : sess_dst(sess)); addr = (s ? si_dst(cs_si(s->csf)) : sess_dst(sess));
if (addr) { if (addr) {
/* sess->listener is always defined when the session's owner is an inbound connections */ /* sess->listener is always defined when the session's owner is an inbound connections */
if (addr->ss_family == AF_UNIX) if (addr->ss_family == AF_UNIX)
@ -2602,9 +2602,9 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
case LOG_FMT_RETRIES: // %rq case LOG_FMT_RETRIES: // %rq
if (s_flags & SF_REDISP) if (s_flags & SF_REDISP)
LOGCHAR('+'); LOGCHAR('+');
ret = ltoa_o(((s && s->si[1].conn_retries > 0) ret = ltoa_o(((s && cs_si(s->csb)->conn_retries > 0)
? (be->conn_retries - s->si[1].conn_retries) ? (be->conn_retries - cs_si(s->csb)->conn_retries)
: ((s && s->si[1].state != SI_ST_INI) ? be->conn_retries : 0)), : ((s && cs_si(s->csb)->state != SI_ST_INI) ? be->conn_retries : 0)),
tmplog, dst + maxsize - tmplog); tmplog, dst + maxsize - tmplog);
if (ret == NULL) if (ret == NULL)
goto out; goto out;
@ -3066,7 +3066,7 @@ void strm_log(struct stream *s)
err = (s->flags & SF_REDISP) || err = (s->flags & SF_REDISP) ||
((s->flags & SF_ERR_MASK) > SF_ERR_LOCAL) || ((s->flags & SF_ERR_MASK) > SF_ERR_LOCAL) ||
(((s->flags & SF_ERR_MASK) == SF_ERR_NONE) && (((s->flags & SF_ERR_MASK) == SF_ERR_NONE) &&
(s->si[1].conn_retries != s->be->conn_retries)) || (cs_si(s->csb)->conn_retries != s->be->conn_retries)) ||
((sess->fe->mode == PR_MODE_HTTP) && s->txn && s->txn->status >= 500); ((sess->fe->mode == PR_MODE_HTTP) && s->txn && s->txn->status >= 500);
if (!err && (sess->fe->options2 & PR_O2_NOLOGNORM)) if (!err && (sess->fe->options2 & PR_O2_NOLOGNORM))