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

MEDIUM: log: add a log level override value in struct session

Browse Source 
This log level will be used in a further patch to change the log level
depending on the request or response.
This commit is contained in:
Willy Tarreau 2013-06-11 17:18:02 +02:00
parent f4c43c13be
commit abcd5145f8
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types/session.h
View File

@ -151,6 +151,7 @@ struct session {
struct stream_interface si[2]; /* client and server stream interfaces */ struct stream_interface si[2]; /* client and server stream interfaces */
struct { struct {
int logwait; /* log fields waiting to be collected : LW_* */ int logwait; /* log fields waiting to be collected : LW_* */
int level; /* log level to force + 1 if > 0, -1 = no log */
struct timeval accept_date; /* date of the accept() in user date */ struct timeval accept_date; /* date of the accept() in user date */
struct timeval tv_accept; /* date of the accept() in internal date (monotonic) */ struct timeval tv_accept; /* date of the accept() in internal date (monotonic) */
struct timeval tv_request; /* date the request arrives, {0,0} if never occurs */ struct timeval tv_request; /* date the request arrives, {0,0} if never occurs */

15
src/log.c
View File

@ -1528,9 +1528,18 @@ void sess_log(struct session *s)
if (LIST_ISEMPTY(&s->fe->logsrvs)) if (LIST_ISEMPTY(&s->fe->logsrvs))
return; return;
level = LOG_INFO; if (s->logs.level) { /* loglevel was overridden */
if (err && (s->fe->options2 & PR_O2_LOGERRORS)) if (s->logs.level == -1) {
level = LOG_ERR; s->logs.logwait = 0; /* logs disabled */
return;
}
level = s->logs.level - 1;
}
else {
level = LOG_INFO;
if (err && (s->fe->options2 & PR_O2_LOGERRORS))
level = LOG_ERR;
}
tmplog = update_log_hdr(); tmplog = update_log_hdr();
size = tmplog - logline; size = tmplog - logline;

1
src/peers.c
View File

@ -1185,6 +1185,7 @@ static struct session *peer_session_create(struct peer *peer, struct peer_sessio
*/ */
s->logs.logwait = 0; s->logs.logwait = 0;
s->logs.level = 0;
s->do_log = NULL; s->do_log = NULL;
/* default error reporting function, may be changed by analysers */ /* default error reporting function, may be changed by analysers */

2
src/proto_http.c
View File

@ -2528,6 +2528,7 @@ int http_wait_for_request(struct session *s, struct channel *req, int an_bit)
msg->msg_state = HTTP_MSG_RQBEFORE; msg->msg_state = HTTP_MSG_RQBEFORE;
req->analysers = 0; req->analysers = 0;
s->logs.logwait = 0; s->logs.logwait = 0;
s->logs.level = 0;
s->rep->flags &= ~CF_EXPECT_MORE; /* speed up sending a previous response */ s->rep->flags &= ~CF_EXPECT_MORE; /* speed up sending a previous response */
stream_int_retnclose(req->prod, NULL); stream_int_retnclose(req->prod, NULL);
return 0; return 0;
@ -8315,6 +8316,7 @@ void http_reset_txn(struct session *s)
s->be = s->fe; s->be = s->fe;
s->logs.logwait = s->fe->to_log; s->logs.logwait = s->fe->to_log;
s->logs.level = 0;
session_del_srv_conn(s); session_del_srv_conn(s);
s->target = NULL; s->target = NULL;
/* re-init store persistence */ /* re-init store persistence */