RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-04 23:29:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: frontend: move some stream initialisation to stream_new()

Browse Source 
This is mostly what is related to logging, and which is more of
a stream initialization than anything frontend-specific.
This commit is contained in:
Willy Tarreau 2015-04-05 12:03:54 +02:00
parent 02d863866d
commit 99eb0f13bc
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/frontend.c
View File

@ -60,23 +60,6 @@ int frontend_accept(struct stream *s)
int cfd = conn->t.sock.fd; int cfd = conn->t.sock.fd;
tv_zero(&s->logs.tv_request);
s->logs.t_queue = -1;
s->logs.t_connect = -1;
s->logs.t_data = -1;
s->logs.t_close = 0;
s->logs.bytes_in = s->logs.bytes_out = 0;
s->logs.prx_queue_size = 0; /* we get the number of pending conns before us */
s->logs.srv_queue_size = 0; /* we will get this number soon */
/* FIXME: the logs are horribly complicated now, because they are
* defined in <p>, <p>, and later <be> and <be>.
*/
s->do_log = strm_log;
/* default error reporting function, may be changed by analysers */
s->srv_error = default_srv_error;
/* Adjust some socket options */ /* Adjust some socket options */
if (l->addr.ss_family == AF_INET || l->addr.ss_family == AF_INET6) { if (l->addr.ss_family == AF_INET || l->addr.ss_family == AF_INET6) {
if (setsockopt(cfd, IPPROTO_TCP, TCP_NODELAY, if (setsockopt(cfd, IPPROTO_TCP, TCP_NODELAY,

18
src/stream.c
View File

@ -83,6 +83,22 @@ struct stream *stream_new(struct session *sess, struct task *t)
s->flags = 0; s->flags = 0;
s->logs.logwait = p->to_log; s->logs.logwait = p->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 */
tv_zero(&s->logs.tv_request);
s->logs.t_queue = -1;
s->logs.t_connect = -1;
s->logs.t_data = -1;
s->logs.t_close = 0;
s->logs.bytes_in = s->logs.bytes_out = 0;
s->logs.prx_queue_size = 0; /* we get the number of pending conns before us */
s->logs.srv_queue_size = 0; /* we will get this number soon */
/* default logging function */
s->do_log = strm_log;
/* default error reporting function, may be changed by analysers */
s->srv_error = default_srv_error;
/* Initialise the current rule list pointer to NULL. We are sure that /* Initialise the current rule list pointer to NULL. We are sure that
* any rulelist match the NULL pointer. * any rulelist match the NULL pointer.
@ -95,8 +111,6 @@ struct stream *stream_new(struct session *sess, struct task *t)
s->si[0].flags = SI_FL_NONE; s->si[0].flags = SI_FL_NONE;
s->si[1].flags = SI_FL_ISBACK; s->si[1].flags = SI_FL_ISBACK;
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->uniq_id = global.req_count++; s->uniq_id = global.req_count++;
/* OK, we're keeping the stream, so let's properly initialize the stream */ /* OK, we're keeping the stream, so let's properly initialize the stream */