From: Willy Tarreau <w@1wt.eu>
Date: Sat, 3 Feb 2024 11:01:58 +0000 (+0100)
Subject: BUG/MINOR: diag: always show the version before dumping a diag warning
X-Git-Tag: v3.0-dev3~91
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ced41484018835bacab2bd74506edc8aac05b1ce;p=thirdparty%2Fhaproxy.git

BUG/MINOR: diag: always show the version before dumping a diag warning

Diag warnings were added in 2.4 by commit 7b01a8dbd ("MINOR: global:
define diagnostic mode of execution") but probably due to the split
function that checks for the mode, they did not reuse the emission of
the version string before the first warning, as was brought in 2.2 by
commit bebd21206 ("MINOR: init: report in "haproxy -c" whether there
were warnings or not"). The effet is that diag warnings are emitted
before the version string if there is no other warning nor error. Let's
just proceed like for the two other ones.

This can be backported to 2.4, though this is of very low importance.
---

diff --git a/src/errors.c b/src/errors.c
index e30f21ef28..7a2d14a153 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -472,6 +472,10 @@ void ha_warning(const char *fmt, ...)
  */
 void _ha_vdiag_warning(const char *fmt, va_list argp)
 {
+	warned |= WARN_ANY;
+	HA_ATOMIC_INC(&tot_warnings);
+
+	warn_exec_path();
 	print_message(1, "DIAG", fmt, argp);
 }