mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-10 13:31:30 +01:00
Code Issues Projects Releases Wiki Activity

Revert "MINOR: cli: emit a warning when _getsocks was used more than once"

Browse Source 
This reverts commit 519cd2021bda11231d461f5974b4e321d0b4eb29.

This was reverted because it's still useful to have access to _getsosks
when the previous reload failed.
This commit is contained in:
William Lallemand 2022-07-27 13:55:54 +02:00
parent 14b98ef1bd
commit 9c821e615e
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cli.c
View File

@ -1981,7 +1981,6 @@ static int bind_parse_severity_output(char **args, int cur_arg, struct proxy *px
/* Send all the bound sockets, always returns 1 */ /* Send all the bound sockets, always returns 1 */
static int _getsocks(char **args, char *payload, struct appctx *appctx, void *private) static int _getsocks(char **args, char *payload, struct appctx *appctx, void *private)
{ {
static int already_sent = 0;
char *cmsgbuf = NULL; char *cmsgbuf = NULL;
unsigned char *tmpbuf = NULL; unsigned char *tmpbuf = NULL;
struct cmsghdr *cmsg; struct cmsghdr *cmsg;
@ -2009,11 +2008,6 @@ static int _getsocks(char **args, char *payload, struct appctx *appctx, void *pr
fd = remote->handle.fd; fd = remote->handle.fd;
if (already_sent) {
ha_warning("_getsocks: attempt to get sockets but they were already sent!\n");
goto out;
}
/* Temporary set the FD in blocking mode, that will make our life easier */ /* Temporary set the FD in blocking mode, that will make our life easier */
old_fcntl = fcntl(fd, F_GETFL); old_fcntl = fcntl(fd, F_GETFL);
if (old_fcntl < 0) { if (old_fcntl < 0) {
@ -2150,8 +2144,6 @@ static int _getsocks(char **args, char *payload, struct appctx *appctx, void *pr
} }
} }
already_sent = 1;
/* flush pending stuff */ /* flush pending stuff */
if (nb_queued) { if (nb_queued) {
iov.iov_len = curoff; iov.iov_len = curoff;