From: Valentine Krasnobaeva <vkrasnobaeva@haproxy.com>
Date: Thu, 26 Jun 2025 14:50:19 +0000 (+0200)
Subject: CLEANUP: startup: move comment about nbthread where it's more appropriate
X-Git-Tag: v3.3-dev2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20110491d3f98d5fa1f3a6e19a8c7ffb01efb121;p=thirdparty%2Fhaproxy.git

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

Move the comment about non_global_section_parsed just above the line, where
we reset it.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 731442eb6..6e1d24f00 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -3251,13 +3251,6 @@ int main(int argc, char **argv)
 	/* Worker, daemon, foreground modes read the rest of the config */
 	if (!master) {
 		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 (clean_env() != 0) {
 				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);
 
+		/* 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;
 		if (read_cfg() < 0) {
 			list_for_each_entry_safe(cfg, cfg_tmp, &cfg_cfgfiles, list) {