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

MEDIUM: mworker: does not create the CLI proxy when no listener

Browse Source 
Does not create the CLI proxy if no -S argument was specified. It
prevents a warning that says that the MASTER proxy does not have any
bind option.
This commit is contained in:
William Lallemand 2018-11-06 17:37:12 +01:00 committed by Willy Tarreau
parent 6b7cd0a72b
commit 550db6d188
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cli.c
View File

@ -2105,7 +2105,8 @@ int pcli_wait_for_response(struct stream *s, struct channel *rep, int an_bit)
*/ */
void mworker_cli_proxy_stop() void mworker_cli_proxy_stop()
{ {
stop_proxy(mworker_proxy); if (mworker_proxy)
stop_proxy(mworker_proxy);
} }
/* /*

25
src/haproxy.c
View File

@ -1736,6 +1736,8 @@ static void init(int argc, char **argv)
tmproc->pid = -1; tmproc->pid = -1;
tmproc->reloads = 0; tmproc->reloads = 0;
tmproc->relative_pid = 1 + proc; tmproc->relative_pid = 1 + proc;
tmproc->ipc_fd[0] = -1;
tmproc->ipc_fd[1] = -1;
if (mworker_cli_sockpair_new(tmproc, proc) < 0) { if (mworker_cli_sockpair_new(tmproc, proc) < 0) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -1745,22 +1747,25 @@ static void init(int argc, char **argv)
} }
mworker_env_to_proc_list(); /* get the info of the children in the env */ mworker_env_to_proc_list(); /* get the info of the children in the env */
if (mworker_cli_proxy_create() < 0) {
ha_alert("Can't create the master's CLI.\n");
exit(EXIT_FAILURE);
}
list_for_each_entry_safe(c, it, &mworker_cli_conf, list) { if (!LIST_ISEMPTY(&mworker_cli_conf)) {
if (mworker_cli_proxy_new_listener(c->s) < 0) { if (mworker_cli_proxy_create() < 0) {
ha_alert("Can't create the master's CLI.\n"); ha_alert("Can't create the master's CLI.\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
LIST_DEL(&c->list);
free(c->s);
free(c);
}
list_for_each_entry_safe(c, it, &mworker_cli_conf, list) {
if (mworker_cli_proxy_new_listener(c->s) < 0) {
ha_alert("Can't create the master's CLI.\n");
exit(EXIT_FAILURE);
}
LIST_DEL(&c->list);
free(c->s);
free(c);
}
}
} }
pattern_finalize_config(); pattern_finalize_config();