mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: mworker: parse program only in MODE_DISCOVERY

Browse Source 
This patch is a part of series to reintroduce the program support in the new
master-worker architecture.

Master process launches external programs, so it needs to read program
section. Thus, it should be parsed in MODE_DISCOVERY. Worker does not need
program settings, so let's check the runtime mode in cfg_parse_program. Worker
should always skip this section.
This commit is contained in:
Valentine Krasnobaeva 2024-10-10 23:50:59 +02:00 committed by Willy Tarreau
parent ee7fc98320
commit 45a284895a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mworker-prog.c
View File

@ -137,6 +137,9 @@ int cfg_parse_program(const char *file, int linenum, char **args, int kwm)
struct mworker_proc *child;
int err_code = 0;
if (!(global.mode & MODE_DISCOVERY))
return err_code;
if (strcmp(args[0], "program") == 0) {
if (alertif_too_many_args(1, file, linenum, args, &err_code)) {
err_code |= ERR_ABORT;
@ -331,6 +334,9 @@ int cfg_program_postparser()
int err_code = 0;
struct mworker_proc *child;
if (!(global.mode & MODE_DISCOVERY))
return err_code;
list_for_each_entry(child, &proc_list, list) {
if (child->reloads == 0 && (child->options & PROC_O_TYPE_PROG)) {
if (child->command == NULL) {