MINOR: config: remove obsolete use of DEFAULT_MAXCONN at various places
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.
diff --git a/include/common/defaults.h b/include/common/defaults.h
index cdc6665..80ef2c9 100644
--- a/include/common/defaults.h
+++ b/include/common/defaults.h
@@ -194,11 +194,7 @@
* emitted. The only way to override this limit will be to set it via the
* command-line '-n' argument.
*/
-#ifndef SYSTEM_MAXCONN
-#ifndef DEFAULT_MAXCONN
-#define DEFAULT_MAXCONN 2000
-#endif
-#else
+#ifdef SYSTEM_MAXCONN
#undef DEFAULT_MAXCONN
#define DEFAULT_MAXCONN SYSTEM_MAXCONN
#endif
diff --git a/src/cfgparse-global.c b/src/cfgparse-global.c
index 117347a..92a089f 100644
--- a/src/cfgparse-global.c
+++ b/src/cfgparse-global.c
@@ -528,9 +528,9 @@
}
global.maxconn = atol(args[1]);
#ifdef SYSTEM_MAXCONN
- if (global.maxconn > DEFAULT_MAXCONN && cfg_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, DEFAULT_MAXCONN);
- global.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, SYSTEM_MAXCONN);
+ global.maxconn = SYSTEM_MAXCONN;
err_code |= ERR_ALERT;
}
#endif /* SYSTEM_MAXCONN */
diff --git a/src/haproxy.c b/src/haproxy.c
index 781d962..7095d70 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -398,9 +398,9 @@
"\n OPTIONS = " BUILD_OPTIONS
#endif
"\n\nDefault settings :"
- "\n maxconn = %d, bufsize = %d, maxrewrite = %d, maxpollevents = %d"
+ "\n bufsize = %d, maxrewrite = %d, maxpollevents = %d"
"\n\n",
- DEFAULT_MAXCONN, BUFSIZE, MAXREWRITE, MAX_POLL_EVENTS);
+ BUFSIZE, MAXREWRITE, MAX_POLL_EVENTS);
list_for_each_entry(item, &build_opts_list, list) {
puts(item->str);
@@ -437,7 +437,7 @@
#endif
" -q quiet mode : don't display messages\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"
" -N sets the default, per-proxy maximum # of connections (%d)\n"
" -L set local peer name (default to hostname)\n"
@@ -466,7 +466,7 @@
" -x <unix_socket> get listening sockets from a unix socket\n"
" -S <unix_socket>[,<bind options>...] new stats socket for the master\n"
"\n",
- name, DEFAULT_MAXCONN, cfg_maxpconn);
+ name, cfg_maxpconn);
exit(1);
}
@@ -2065,8 +2065,8 @@
global.maxconn = MIN(global.maxconn, ideal_maxconn);
global.maxconn = round_2dig(global.maxconn);
#ifdef SYSTEM_MAXCONN
- if (global.maxconn > DEFAULT_MAXCONN)
- global.maxconn = DEFAULT_MAXCONN;
+ if (global.maxconn > SYSTEM_MAXCONN)
+ global.maxconn = SYSTEM_MAXCONN;
#endif /* SYSTEM_MAXCONN */
global.maxsslconn = sides * global.maxconn;
if (global.mode & (MODE_VERBOSE|MODE_DEBUG))
@@ -2130,8 +2130,8 @@
global.maxconn = MIN(global.maxconn, ideal_maxconn);
global.maxconn = round_2dig(global.maxconn);
#ifdef SYSTEM_MAXCONN
- if (global.maxconn > DEFAULT_MAXCONN)
- global.maxconn = DEFAULT_MAXCONN;
+ if (global.maxconn > SYSTEM_MAXCONN)
+ global.maxconn = SYSTEM_MAXCONN;
#endif /* SYSTEM_MAXCONN */
if (clearmem <= 0 || !global.maxconn) {