]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: cfgparse-global: fix err msg in mworker keyword parser
authorValentine Krasnobaeva <vkrasnobaeva@haproxy.com>
Wed, 14 Aug 2024 14:20:15 +0000 (16:20 +0200)
committerWilliam Lallemand <wlallemand@haproxy.com>
Tue, 20 Aug 2024 17:16:27 +0000 (19:16 +0200)
This patch fixes the commit 118ac11ce
("cfgparse-global: move mode's keywords in cfg_kw_list"). Error message
delivered by keyword parser in **err is always shown with ha_alert() by the
caller cfg_parse_global(). The caller always supplies these alerts with the
filename and the line number.

src/cfgparse-global.c

index dbc355a4c8e87152b7203a0b9d051de4f83915bb..1fb61e63ed80aa06d6c916d69c619b14e83bb928 100644 (file)
@@ -1388,8 +1388,8 @@ static int cfg_parse_global_master_worker(char **args, int section_type,
                if (strcmp(args[1], "no-exit-on-failure") == 0)
                        global.tune.options |= GTUNE_NOEXIT_ONFAILURE;
                else {
-                       memprintf(err, "parsing [%s:%d] : '%s' only supports 'no-exit-on-failure' option",
-                                 file, line, args[0]);
+                       memprintf(err, "'%s' only supports 'no-exit-on-failure' option",
+                                 args[0]);
                        return -1;
                }
        }