[MINOR] implement per-logger log level limitation
Some people are using haproxy in a shared environment where the
system logger by default sends alert and emerg messages to all
consoles, which happens when all servers go down on a backend for
instance. These people can not always change the system configuration
and would like to limit the outgoing messages level in order not to
disturb the local users.
The addition of an optional 4th field on the "log" line permits
exactly this. The minimal log level ensures that all outgoing logs
will have at least this level. So the logs are not filtered out,
just set to this level.
diff --git a/src/log.c b/src/log.c
index bc9fd0a..093accb 100644
--- a/src/log.c
+++ b/src/log.c
@@ -176,7 +176,7 @@
int fac_level;
int hdr_len, data_len;
struct logsrv *logsrvs[2];
- int facilities[2], loglevel[2];
+ int facilities[2], loglevel[2], minlvl[2];
int nblogger;
int nbloggers = 0;
char *log_ptr;
@@ -222,12 +222,14 @@
logsrvs[nbloggers] = &global.logsrv1;
facilities[nbloggers] = global.logfac1;
loglevel[nbloggers] = global.loglev1;
+ minlvl[nbloggers] = global.minlvl1;
nbloggers++;
}
if (global.logfac2 >= 0) {
logsrvs[nbloggers] = &global.logsrv2;
facilities[nbloggers] = global.logfac2;
loglevel[nbloggers] = global.loglev2;
+ minlvl[nbloggers] = global.minlvl2;
nbloggers++;
}
} else {
@@ -235,12 +237,14 @@
logsrvs[nbloggers] = &p->logsrv1;
facilities[nbloggers] = p->logfac1;
loglevel[nbloggers] = p->loglev1;
+ minlvl[nbloggers] = p->minlvl1;
nbloggers++;
}
if (p->logfac2 >= 0) {
logsrvs[nbloggers] = &p->logsrv2;
facilities[nbloggers] = p->logfac2;
loglevel[nbloggers] = p->loglev2;
+ minlvl[nbloggers] = p->minlvl2;
nbloggers++;
}
}
@@ -292,7 +296,7 @@
* time, we only change the facility in the pre-computed header,
* and we change the pointer to the header accordingly.
*/
- fac_level = (facilities[nblogger] << 3) + level;
+ fac_level = (facilities[nblogger] << 3) + MAX(level, minlvl[nblogger]);
log_ptr = logmsg + 3; /* last digit of the log level */
do {
*log_ptr = '0' + fac_level % 10;