mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: startup: move comment about nbthread where it's more appropriate

Browse Source 
Move the comment about non_global_section_parsed just above the line, where
we reset it.
This commit is contained in:
Valentine Krasnobaeva 2025-06-26 16:50:19 +02:00 committed by Willy Tarreau
parent a9afc10ae8
commit 20110491d3
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/haproxy.c
View File

@ -3251,13 +3251,6 @@ int main(int argc, char **argv)
/* Worker, daemon, foreground modes read the rest of the config */ /* Worker, daemon, foreground modes read the rest of the config */
if (!master) { if (!master) {
usermsgs_clr("config"); usermsgs_clr("config");
/* nbthread and *thread keywords parsers are sensible to global
* section position, it should be placed as the first in
* the configuration, if these keywords are inside. So, let's
* reset non_global_section_parsed counter for the second
* configuration reading
*/
if (global.mode & MODE_MWORKER) { if (global.mode & MODE_MWORKER) {
if (clean_env() != 0) { if (clean_env() != 0) {
ha_alert("Worker failed to clean its env, exiting.\n"); ha_alert("Worker failed to clean its env, exiting.\n");
@ -3278,6 +3271,12 @@ int main(int argc, char **argv)
*/ */
setenv("HAPROXY_LOCALPEER", localpeer, 1); setenv("HAPROXY_LOCALPEER", localpeer, 1);
/* nbthread and *thread keywords parsers are sensible to global
* section position, it should be placed as the first in
* the configuration, if these keywords are inside. So, let's
* reset non_global_section_parsed counter for the second
* configuration reading
*/
non_global_section_parsed = 0; non_global_section_parsed = 0;
if (read_cfg() < 0) { if (read_cfg() < 0) {
list_for_each_entry_safe(cfg, cfg_tmp, &cfg_cfgfiles, list) { list_for_each_entry_safe(cfg, cfg_tmp, &cfg_cfgfiles, list) {