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

MINOR: stream: Rely on CS's info if it exists and fallback on session's ones

Browse Source 
When the stream is created, If si_get_cs_info() returns valid info for the client
connection stream, we use it. Otherwise we use session' info.
This commit is contained in:
Christopher Faulet 2018-11-29 15:19:05 +01:00 committed by Willy Tarreau
parent feb1174be0
commit b3484d67d3
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/stream.c
View File

@ -128,6 +128,7 @@ struct stream *stream_new(struct session *sess, enum obj_type *origin)
struct task *t; struct task *t;
struct conn_stream *cs = objt_cs(origin); struct conn_stream *cs = objt_cs(origin);
struct appctx *appctx = objt_appctx(origin); struct appctx *appctx = objt_appctx(origin);
const struct cs_info *csinfo;
if (unlikely((s = pool_alloc(pool_head_stream)) == NULL)) if (unlikely((s = pool_alloc(pool_head_stream)) == NULL))
goto out_fail_alloc; goto out_fail_alloc;
@ -141,10 +142,6 @@ struct stream *stream_new(struct session *sess, enum obj_type *origin)
s->flags = 0; s->flags = 0;
s->logs.logwait = sess->fe->to_log; s->logs.logwait = sess->fe->to_log;
s->logs.level = 0; s->logs.level = 0;
s->logs.accept_date = sess->accept_date; /* user-visible date for logging */
s->logs.tv_accept = sess->tv_accept; /* corrected date for internal use */
s->logs.t_handshake = sess->t_handshake;
s->logs.t_idle = -1;
tv_zero(&s->logs.tv_request); tv_zero(&s->logs.tv_request);
s->logs.t_queue = -1; s->logs.t_queue = -1;
s->logs.t_connect = -1; s->logs.t_connect = -1;
@ -154,6 +151,20 @@ struct stream *stream_new(struct session *sess, enum obj_type *origin)
s->logs.prx_queue_pos = 0; /* we get the number of pending conns before us */ s->logs.prx_queue_pos = 0; /* we get the number of pending conns before us */
s->logs.srv_queue_pos = 0; /* we will get this number soon */ s->logs.srv_queue_pos = 0; /* we will get this number soon */
csinfo = si_get_cs_info(cs);
if (csinfo) {
s->logs.accept_date = csinfo->create_date;
s->logs.tv_accept = csinfo->tv_create;
s->logs.t_handshake = csinfo->t_handshake;
s->logs.t_idle = csinfo->t_idle;
}
else {
s->logs.accept_date = sess->accept_date;
s->logs.tv_accept = sess->tv_accept;
s->logs.t_handshake = sess->t_handshake;
s->logs.t_idle = -1;
}
/* default logging function */ /* default logging function */
s->do_log = strm_log; s->do_log = strm_log;