RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: bwlim/config: fix missing '\n' after error messages 

Some bwlim error messages at parsing time were missing the trailing '\n'
in commit 2b6777021d ("MEDIUM: bwlim: Add support of bandwith limitation
at the stream level"). This commit can be backported wherever the commit
above is (likely as far as 2.7).
This commit is contained in:
Willy Tarreau 2024-04-03 11:30:07 +02:00
parent f821a3983e
commit 15522fc243
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/flt_bwlim.c
View File

@ -219,26 +219,26 @@ static int bwlim_check(struct proxy *px, struct flt_conf *fconf)
target = px->table; target = px->table;
if (!target) { if (!target) {
ha_alert("Proxy %s : unable to find table '%s' referenced by bwlim filter '%s'", ha_alert("Proxy %s : unable to find table '%s' referenced by bwlim filter '%s'\n",
px->id, conf->table.n ? conf->table.n : px->id, conf->name); px->id, conf->table.n ? conf->table.n : px->id, conf->name);
return 1; return 1;
} }
if ((conf->flags & BWLIM_FL_IN) && !target->data_ofs[STKTABLE_DT_BYTES_IN_RATE]) { if ((conf->flags & BWLIM_FL_IN) && !target->data_ofs[STKTABLE_DT_BYTES_IN_RATE]) {
ha_alert("Proxy %s : stick-table '%s' uses a data type incompatible with bwlim filter '%s'." ha_alert("Proxy %s : stick-table '%s' uses a data type incompatible with bwlim filter '%s'."
" It must be 'bytes_in_rate'", " It must be 'bytes_in_rate'\n",
px->id, conf->table.n ? conf->table.n : px->id, conf->name); px->id, conf->table.n ? conf->table.n : px->id, conf->name);
return 1; return 1;
} }
else if ((conf->flags & BWLIM_FL_OUT) && !target->data_ofs[STKTABLE_DT_BYTES_OUT_RATE]) { else if ((conf->flags & BWLIM_FL_OUT) && !target->data_ofs[STKTABLE_DT_BYTES_OUT_RATE]) {
ha_alert("Proxy %s : stick-table '%s' uses a data type incompatible with bwlim filter '%s'." ha_alert("Proxy %s : stick-table '%s' uses a data type incompatible with bwlim filter '%s'."
" It must be 'bytes_out_rate'", " It must be 'bytes_out_rate'\n",
px->id, conf->table.n ? conf->table.n : px->id, conf->name); px->id, conf->table.n ? conf->table.n : px->id, conf->name);
return 1; return 1;
} }
if (!stktable_compatible_sample(conf->expr, target->type)) { if (!stktable_compatible_sample(conf->expr, target->type)) {
ha_alert("Proxy %s : stick-table '%s' uses a key type incompatible with bwlim filter '%s'", ha_alert("Proxy %s : stick-table '%s' uses a key type incompatible with bwlim filter '%s'\n",
px->id, conf->table.n ? conf->table.n : px->id, conf->name); px->id, conf->table.n ? conf->table.n : px->id, conf->name);
return 1; return 1;
} }