MINOR: config: make strict limits enabled by default
as agreed a few months ago, enable strict-limits for v2.3
update configuration manual accordingly
Signed-off-by: William Dauchy <w.dauchy@criteo.com>
diff --git a/src/haproxy.c b/src/haproxy.c
index 786dd16..6c55664 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1791,6 +1791,7 @@
#ifdef USE_THREAD
global.tune.options |= GTUNE_IDLE_POOL_SHARED;
#endif
+ global.tune.options |= GTUNE_STRICT_LIMITS;
pid = getpid();
progname = *argv;
@@ -3171,8 +3172,7 @@
if (setrlimit(RLIMIT_NOFILE, &limit) != -1)
getrlimit(RLIMIT_NOFILE, &limit);
- ha_warning("[%s.main()] Cannot raise FD limit to %d, limit is %d. "
- "This will fail in >= v2.3\n",
+ ha_warning("[%s.main()] Cannot raise FD limit to %d, limit is %d.\n",
argv[0], global.rlimit_nofile, (int)limit.rlim_cur);
global.rlimit_nofile = limit.rlim_cur;
}
@@ -3191,8 +3191,7 @@
exit(1);
}
else
- ha_warning("[%s.main()] Cannot fix MEM limit to %d megs."
- "This will fail in >= v2.3\n",
+ ha_warning("[%s.main()] Cannot fix MEM limit to %d megs.\n",
argv[0], global.rlimit_memmax);
}
#else
@@ -3204,8 +3203,7 @@
exit(1);
}
else
- ha_warning("[%s.main()] Cannot fix MEM limit to %d megs."
- "This will fail in >= v2.3\n",
+ ha_warning("[%s.main()] Cannot fix MEM limit to %d megs.\n",
argv[0], global.rlimit_memmax);
}
#endif
@@ -3391,8 +3389,7 @@
}
else
ha_alert("[%s.main()] FD limit (%d) too low for maxconn=%d/maxsock=%d. "
- "Please raise 'ulimit-n' to %d or more to avoid any trouble."
- "This will fail in >= v2.3\n",
+ "Please raise 'ulimit-n' to %d or more to avoid any trouble.\n",
argv[0], (int)limit.rlim_cur, global.maxconn, global.maxsock,
global.maxsock);
}
@@ -3674,7 +3671,7 @@
}
else
ha_warning("[%s.main()] Failed to set the raise the maximum "
- "file size. This will fail in >= v2.3\n", argv[0]);
+ "file size.\n", argv[0]);
}
#endif
@@ -3688,7 +3685,7 @@
}
else
ha_warning("[%s.main()] Failed to set the raise the core "
- "dump size. This will fail in >= v2.3\n", argv[0]);
+ "dump size.\n", argv[0]);
}
#endif