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

MINOR: stream: Always get idle duration from the session

Browse Source 
Since the idle duration provided by the session is always up-to-date, there
is no more reason to rely on the multiplexer cs_info to set it to the
stream.
This commit is contained in:
Christopher Faulet 2020-09-30 13:49:56 +02:00
parent dd78921c66
commit 7a6c513246
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/http_ana.c
View File

@ -109,13 +109,8 @@ int http_wait_for_request(struct stream *s, struct channel *req, int an_bit)
s->srv_error = http_return_srv_error; s->srv_error = http_return_srv_error;
/* If there is data available for analysis, log the end of the idle time. */ /* If there is data available for analysis, log the end of the idle time. */
if (c_data(req) && s->logs.t_idle == -1) { if (c_data(req) && s->logs.t_idle == -1)
const struct cs_info *csinfo = si_get_cs_info(objt_cs(s->si[0].end)); s->logs.t_idle = sess->t_idle;
s->logs.t_idle = ((csinfo)
? csinfo->t_idle
: tv_ms_elapsed(&s->logs.tv_accept, &now) - s->logs.t_handshake);
}
/* /*
* Now we quickly check if we have found a full valid request. * Now we quickly check if we have found a full valid request.

3
src/stream.c
View File

@ -351,14 +351,13 @@ struct stream *stream_new(struct session *sess, enum obj_type *origin)
s->logs.accept_date = csinfo->create_date; s->logs.accept_date = csinfo->create_date;
s->logs.tv_accept = csinfo->tv_create; s->logs.tv_accept = csinfo->tv_create;
s->logs.t_handshake = csinfo->t_handshake; s->logs.t_handshake = csinfo->t_handshake;
s->logs.t_idle = csinfo->t_idle;
} }
else { else {
s->logs.accept_date = sess->accept_date; s->logs.accept_date = sess->accept_date;
s->logs.tv_accept = sess->tv_accept; s->logs.tv_accept = sess->tv_accept;
s->logs.t_handshake = sess->t_handshake; s->logs.t_handshake = sess->t_handshake;
s->logs.t_idle = -1;
} }
s->logs.t_idle = sess->t_idle;
/* default logging function */ /* default logging function */
s->do_log = strm_log; s->do_log = strm_log;