mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: config: remove obsolete use of DEFAULT_MAXCONN at various places

Browse Source 
This entry was still set to 2000 but never used anymore. The only places
where it appeared was as an alias to SYSTEM_MAXCONN which forces it, so
let's turn these ones to SYSTEM_MAXCONN and remove the default value for
DEFAULT_MAXCONN. SYSTEM_MAXCONN still defines the upper bound however.
This commit is contained in:
Willy Tarreau 2019-03-13 10:03:07 +01:00
parent 25ad13f9a0
commit ca783d4ee6
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/common/defaults.h
View File

@ -194,11 +194,7 @@
* emitted. The only way to override this limit will be to set it via the * emitted. The only way to override this limit will be to set it via the
* command-line '-n' argument. * command-line '-n' argument.
*/ */
#ifndef SYSTEM_MAXCONN #ifdef SYSTEM_MAXCONN
#ifndef DEFAULT_MAXCONN
#define DEFAULT_MAXCONN 2000
#endif
#else
#undef DEFAULT_MAXCONN #undef DEFAULT_MAXCONN
#define DEFAULT_MAXCONN SYSTEM_MAXCONN #define DEFAULT_MAXCONN SYSTEM_MAXCONN
#endif #endif

6
src/cfgparse-global.c
View File

@ -528,9 +528,9 @@ int cfg_parse_global(const char *file, int linenum, char **args, int kwm)
} }
global.maxconn = atol(args[1]); global.maxconn = atol(args[1]);
#ifdef SYSTEM_MAXCONN #ifdef SYSTEM_MAXCONN
if (global.maxconn > DEFAULT_MAXCONN && cfg_maxconn <= DEFAULT_MAXCONN) { if (global.maxconn > SYSTEM_MAXCONN && cfg_maxconn <= SYSTEM_MAXCONN) {
ha_alert("parsing [%s:%d] : maxconn value %d too high for this system.\nLimiting to %d. Please use '-n' to force the value.\n", file, linenum, global.maxconn, DEFAULT_MAXCONN); ha_alert("parsing [%s:%d] : maxconn value %d too high for this system.\nLimiting to %d. Please use '-n' to force the value.\n", file, linenum, global.maxconn, SYSTEM_MAXCONN);
global.maxconn = DEFAULT_MAXCONN; global.maxconn = SYSTEM_MAXCONN;
err_code |= ERR_ALERT; err_code |= ERR_ALERT;
} }
#endif /* SYSTEM_MAXCONN */ #endif /* SYSTEM_MAXCONN */

16
src/haproxy.c
View File

@ -398,9 +398,9 @@ static void display_build_opts()
"\n OPTIONS = " BUILD_OPTIONS "\n OPTIONS = " BUILD_OPTIONS
#endif #endif
"\n\nDefault settings :" "\n\nDefault settings :"
"\n maxconn = %d, bufsize = %d, maxrewrite = %d, maxpollevents = %d" "\n bufsize = %d, maxrewrite = %d, maxpollevents = %d"
"\n\n", "\n\n",
DEFAULT_MAXCONN, BUFSIZE, MAXREWRITE, MAX_POLL_EVENTS); BUFSIZE, MAXREWRITE, MAX_POLL_EVENTS);
list_for_each_entry(item, &build_opts_list, list) { list_for_each_entry(item, &build_opts_list, list) {
puts(item->str); puts(item->str);
@ -437,7 +437,7 @@ static void usage(char *name)
#endif #endif
" -q quiet mode : don't display messages\n" " -q quiet mode : don't display messages\n"
" -c check mode : only check config files and exit\n" " -c check mode : only check config files and exit\n"
" -n sets the maximum total # of connections (%d)\n" " -n sets the maximum total # of connections (uses ulimit -n)\n"
" -m limits the usable amount of memory (in MB)\n" " -m limits the usable amount of memory (in MB)\n"
" -N sets the default, per-proxy maximum # of connections (%d)\n" " -N sets the default, per-proxy maximum # of connections (%d)\n"
" -L set local peer name (default to hostname)\n" " -L set local peer name (default to hostname)\n"
@ -466,7 +466,7 @@ static void usage(char *name)
" -x <unix_socket> get listening sockets from a unix socket\n" " -x <unix_socket> get listening sockets from a unix socket\n"
" -S <unix_socket>[,<bind options>...] new stats socket for the master\n" " -S <unix_socket>[,<bind options>...] new stats socket for the master\n"
"\n", "\n",
name, DEFAULT_MAXCONN, cfg_maxpconn); name, cfg_maxpconn);
exit(1); exit(1);
} }
@ -2065,8 +2065,8 @@ static void init(int argc, char **argv)
global.maxconn = MIN(global.maxconn, ideal_maxconn); global.maxconn = MIN(global.maxconn, ideal_maxconn);
global.maxconn = round_2dig(global.maxconn); global.maxconn = round_2dig(global.maxconn);
#ifdef SYSTEM_MAXCONN #ifdef SYSTEM_MAXCONN
if (global.maxconn > DEFAULT_MAXCONN) if (global.maxconn > SYSTEM_MAXCONN)
global.maxconn = DEFAULT_MAXCONN; global.maxconn = SYSTEM_MAXCONN;
#endif /* SYSTEM_MAXCONN */ #endif /* SYSTEM_MAXCONN */
global.maxsslconn = sides * global.maxconn; global.maxsslconn = sides * global.maxconn;
if (global.mode & (MODE_VERBOSE|MODE_DEBUG)) if (global.mode & (MODE_VERBOSE|MODE_DEBUG))
@ -2130,8 +2130,8 @@ static void init(int argc, char **argv)
global.maxconn = MIN(global.maxconn, ideal_maxconn); global.maxconn = MIN(global.maxconn, ideal_maxconn);
global.maxconn = round_2dig(global.maxconn); global.maxconn = round_2dig(global.maxconn);
#ifdef SYSTEM_MAXCONN #ifdef SYSTEM_MAXCONN
if (global.maxconn > DEFAULT_MAXCONN) if (global.maxconn > SYSTEM_MAXCONN)
global.maxconn = DEFAULT_MAXCONN; global.maxconn = SYSTEM_MAXCONN;
#endif /* SYSTEM_MAXCONN */ #endif /* SYSTEM_MAXCONN */
if (clearmem <= 0 || !global.maxconn) { if (clearmem <= 0 || !global.maxconn) {