upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-21 22:28:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

MEDIUM: config: inform the user only once that "redispatch" is deprecated

Browse source 
It may go away in 1.6, but there's no point reporting it for each and
every occurrence.
This commit is contained in:
Willy Tarreau 2014-04-28 22:37:32 +02:00
parent 40bac83734
commit a3c504c032
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/types/global.h
View file

@ -175,6 +175,7 @@ extern unsigned int warned; /* bitfield of a few warnings to emit just once
/* bit values to go with "warned" above */
#define WARN_BLOCK_DEPRECATED 0x00000001
#define WARN_REQSETBE_DEPRECATED 0x00000002
#define WARN_REDISPATCH_DEPRECATED 0x00000004
/* to be used with warned and WARN_* */
static inline int already_warned(unsigned int warning)

3
src/cfgparse.c
View file

@ -4062,7 +4062,8 @@ stats_error_parsing:
if (warnifnotcap(curproxy, PR_CAP_BE, file, linenum, args[0], NULL))
err_code |= ERR_WARN;
Warning("parsing [%s:%d]: keyword '%s' is deprecated, please use 'option redispatch' instead.\n",
if (!already_warned(WARN_REDISPATCH_DEPRECATED))
Warning("parsing [%s:%d]: keyword '%s' is deprecated in favor of 'option redispatch', and will not be supported by future versions.\n",
file, linenum, args[0]);
err_code |= ERR_WARN;
/* enable reconnections to dispatch */