mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: logs: Add support of checks as session origin to format lf strings

Browse Source 
When a log-format string is built from an health-check, the session origin
is the health-check itself and not a connection. In addition, there is no
stream. It means for now some formats are not supported: %s, %sc, %b, %bi,
%bp, %si and %sp.

Thanks to this patch, the session origin is converted to a check. So it is
possible to retrieve the backend and the backend connection. Note this
session have no listener, thus %ft format must be guarded.

This patch is light and standalone, thus it may be backported as far as 2.2
if required. However, because the error is human, it is probably better to
wait a bit to be sure everything is properly protected.
This commit is contained in:
Christopher Faulet 2021-04-14 14:01:41 +02:00
parent 0f1fc23d4e
commit fd81848c22
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/log.c
View File

@ -2188,10 +2188,10 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
* A request error is reported as it's the only element we have * A request error is reported as it's the only element we have
* here and which justifies emitting such a log. * here and which justifies emitting such a log.
*/ */
be = fe; be = ((obj_type(sess->origin) == OBJ_TYPE_CHECK) ? __objt_check(sess->origin)->proxy : fe);
txn = NULL; txn = NULL;
fe_conn = objt_conn(sess->origin); fe_conn = objt_conn(sess->origin);
be_conn = NULL; be_conn = ((obj_type(sess->origin) == OBJ_TYPE_CHECK) ? cs_conn(__objt_check(sess->origin)->cs) : NULL);
status = 0; status = 0;
s_flags = SF_ERR_PRXCOND | SF_FINST_R; s_flags = SF_ERR_PRXCOND | SF_FINST_R;
uniq_id = _HA_ATOMIC_FETCH_ADD(&global.req_count, 1); uniq_id = _HA_ATOMIC_FETCH_ADD(&global.req_count, 1);
@ -2518,7 +2518,7 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
if (iret == 0) if (iret == 0)
goto out; goto out;
tmplog += iret; tmplog += iret;
if (sess->listener->bind_conf->xprt == xprt_get(XPRT_SSL)) if (sess->listener && sess->listener->bind_conf->xprt == xprt_get(XPRT_SSL))
LOGCHAR('~'); LOGCHAR('~');
if (tmp->options & LOG_OPT_QUOTE) if (tmp->options & LOG_OPT_QUOTE)
LOGCHAR('"'); LOGCHAR('"');
@ -2561,13 +2561,18 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
break; break;
case LOG_FMT_SERVER: // %s case LOG_FMT_SERVER: // %s
switch (obj_type(s ? s->target : NULL)) { switch (obj_type(s ? s->target : sess->origin)) {
case OBJ_TYPE_SERVER: case OBJ_TYPE_SERVER:
src = __objt_server(s->target)->id; src = __objt_server(s->target)->id;
break; break;
case OBJ_TYPE_APPLET: case OBJ_TYPE_APPLET:
src = __objt_applet(s->target)->name; src = __objt_applet(s->target)->name;
break; break;
case OBJ_TYPE_CHECK:
src = (__objt_check(sess->origin)->server
? __objt_check(sess->origin)->server->id
: "<NOSRV>");
break;
default: default:
src = "<NOSRV>"; src = "<NOSRV>";
break; break;
@ -2768,9 +2773,21 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
break; break;
case LOG_FMT_SRVCONN: // %sc case LOG_FMT_SRVCONN: // %sc
ret = ultoa_o(objt_server(s ? s->target : NULL) ? switch (obj_type(s ? s->target : sess->origin)) {
objt_server(s->target)->cur_sess : case OBJ_TYPE_SERVER:
0, tmplog, dst + maxsize - tmplog); ret = ultoa_o(__objt_server(s->target)->cur_sess,
tmplog, dst + maxsize - tmplog);
break;
case OBJ_TYPE_CHECK:
ret = ultoa_o(__objt_check(sess->origin)->server
? __objt_check(sess->origin)->server->cur_sess
: 0, tmplog, dst + maxsize - tmplog);
break;
default:
ret = ultoa_o(0, tmplog, dst + maxsize - tmplog);
break;
}
if (ret == NULL) if (ret == NULL)
goto out; goto out;
tmplog = ret; tmplog = ret;