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: prefix prepare_master and run_master with mworker_*

Browse Source 
This patch prepares the move of prepare_master() and run_master() definitions
into mworker.c. So, let's at first prefix its names with mworker_*.
This commit is contained in:
Valentine Krasnobaeva 2024-11-22 22:58:53 +01:00 committed by William Lallemand
parent af642420b4
commit 41cc1fe310
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/haproxy.c
View File

@ -1965,7 +1965,7 @@ static void generate_random_cluster_secret()
* CLI at worker side (worker can send its status to master).It only returns if * CLI at worker side (worker can send its status to master).It only returns if
* everything is OK. If something fails, it exits. * everything is OK. If something fails, it exits.
*/ */
static void prepare_master() static void mworker_prepare_master()
{ {
struct mworker_proc *tmproc; struct mworker_proc *tmproc;
@ -2004,7 +2004,7 @@ static void prepare_master()
LIST_APPEND(&proc_list, &tmproc->list); LIST_APPEND(&proc_list, &tmproc->list);
} }
static void run_master() static void mworker_run_master()
{ {
struct mworker_proc *child, *it; struct mworker_proc *child, *it;
@ -3058,7 +3058,7 @@ static void run_master_in_recovery_mode(int argc, char **argv)
step_init_4(); step_init_4();
/* enter in master polling loop */ /* enter in master polling loop */
run_master(); mworker_run_master();
} }
/* parse conf in disovery mode and set modes from config */ /* parse conf in disovery mode and set modes from config */
@ -3758,7 +3758,7 @@ int main(int argc, char **argv)
* setenv("HAPROXY_MWORKER", "1", 1). * setenv("HAPROXY_MWORKER", "1", 1).
*/ */
if (global.mode & MODE_MWORKER) if (global.mode & MODE_MWORKER)
prepare_master(); mworker_prepare_master();
/* If we are in a daemon mode and we might be also in master-worker mode: /* If we are in a daemon mode and we might be also in master-worker mode:
* we should do daemonization fork here to put the main process (which * we should do daemonization fork here to put the main process (which
@ -3890,7 +3890,7 @@ int main(int argc, char **argv)
/* Master enters in its polling loop */ /* Master enters in its polling loop */
if (master) { if (master) {
run_master(); mworker_run_master();
/* never get there in master context */ /* never get there in master context */
} }