[MINOR] add options dontlog-normal and log-separate-errors
Some big traffic sites have trouble dealing with logs and tend to
disable them. Here are two new options to help cope with massive
logs.
- dontlog-normal only disables logging for 100% successful
connections, other ones will still be logged
- log-separate-errors will cause non-100% successful connections
to be logged at level "err" instead of level "info" so that a
properly configured syslog daemon can send them to a different
file for longer conservation.
diff --git a/src/log.c b/src/log.c
index 976bc63..bc9fd0a 100644
--- a/src/log.c
+++ b/src/log.c
@@ -321,10 +321,15 @@
struct proxy *fe = s->fe;
struct proxy *be = s->be;
struct proxy *prx_log;
- int tolog;
+ int tolog, level, err;
char *svid;
struct tm tm;
+ /* if we don't want to log normal traffic, return now */
+ err = (s->flags & (SN_ERR_MASK | SN_REDISP)) || (s->conn_retries != be->conn_retries);
+ if (!err && (fe->options2 & PR_O2_NOLOGNORM))
+ return;
+
if (s->cli_addr.ss_family == AF_INET)
inet_ntop(AF_INET,
(const void *)&((struct sockaddr_in *)&s->cli_addr)->sin_addr,
@@ -353,7 +358,11 @@
tolog = fe->to_log;
svid = (tolog & LW_SVID) ? (s->srv != NULL) ? s->srv->id : "<NOSRV>" : "-";
- send_log(prx_log, LOG_INFO, "%s:%d [%02d/%s/%04d:%02d:%02d:%02d.%03d]"
+ level = LOG_INFO;
+ if (err && (fe->options2 & PR_O2_LOGERRORS))
+ level = LOG_ERR;
+
+ send_log(prx_log, level, "%s:%d [%02d/%s/%04d:%02d:%02d:%02d.%03d]"
" %s %s/%s %ld/%ld/%s%ld %s%lld"
" %c%c %d/%d/%d/%d/%s%u %ld/%ld\n",
pn,