mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-09 16:47:18 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: startup: encapsulate sock_get_old_sockets in a function

Browse Source 
Let's encapsulate here the code, that calls sock_get_old_sockets() to obtain
listeners sockets from the previous process into a separate function. This
will make the code of main() more readable and we can move this new function
(if we might need so) in future.
This commit is contained in:
Valentine Krasnobaeva 2024-10-07 10:53:47 +02:00 committed by Willy Tarreau
parent f4e73b4302
commit babbcb047e
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/haproxy.c
View File

@ -2165,6 +2165,22 @@ static void apply_master_worker_mode()
} }
} }
static void get_listeners_fd()
{
/* Try to get the listeners FD from the previous process using
* _getsocks on the stat socket, it must never been done in wait mode
* and check mode
*/
if (strcmp("/dev/null", old_unixsocket) != 0) {
if (sock_get_old_sockets(old_unixsocket) != 0) {
ha_alert("Failed to get the sockets from the old process!\n");
if (!(global.mode & MODE_MWORKER))
exit(1);
}
}
}
/* /*
* This function does some initialization steps, which are better to perform * This function does some initialization steps, which are better to perform
* before config parsing. It only returns if everything is OK. If something * before config parsing. It only returns if everything is OK. If something
@ -3543,19 +3559,12 @@ int main(int argc, char **argv)
*/ */
step_init_3(); step_init_3();
/* Try to get the listeners FD from the previous process using /* In standalone or in worker mode get the listeners fds from the previous
* _getsocks on the stat socket, it must never been done in wait mode * process using _getsocks on stat socket or on the master CLI socket
* and check mode * respectively.
*/ */
if (old_unixsocket && !(global.mode & MODE_MWORKER)) { if (!master && old_unixsocket)
if (strcmp("/dev/null", old_unixsocket) != 0) { get_listeners_fd();
if (sock_get_old_sockets(old_unixsocket) != 0) {
ha_alert("Failed to get the sockets from the old process!\n");
if (!(global.mode & MODE_MWORKER))
exit(1);
}
}
}
/* We will loop at most 100 times with 10 ms delay each time. /* We will loop at most 100 times with 10 ms delay each time.
* That's at most 1 second. We only send a signal to old pids * That's at most 1 second. We only send a signal to old pids