upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-05-28 04:12:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

MINOR: startup: rename on_new_child_failure to mworker_on_new_child_failure

Browse source 
This patch prepares the moving of on_new_child_failure definition into
mworker.c. So, let's rename it accordingly and let's also update its
description.
This commit is contained in:
Valentine Krasnobaeva 2024-11-22 22:41:46 +01:00 committed by William Lallemand
parent 10c14a1ed0
commit 321c021a83
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/haproxy/global.h
View file

@ -68,7 +68,7 @@ void display_version();
void mworker_accept_wrapper(int fd); void mworker_accept_wrapper(int fd);
void mworker_reload(int hardreload); void mworker_reload(int hardreload);
void on_new_child_failure(void); void mworker_on_new_child_failure(void);
/* to be used with warned and WARN_* */ /* to be used with warned and WARN_* */
static inline int already_warned(unsigned int warning) static inline int already_warned(unsigned int warning)

5
src/haproxy.c
View file

@ -915,9 +915,10 @@ static void mworker_loop()
} }
/* /*
* Reexec the process in failure mode, instead of exiting * Performs some routines for the worker process, which has failed the reload,
* updates the global load_status.
*/ */
void on_new_child_failure() void mworker_on_new_child_failure()
{ {
struct mworker_proc *child; struct mworker_proc *child;

2
src/mworker.c
View file

@ -356,7 +356,7 @@ restart_wait:
/* We didn't find the PID in the list, that shouldn't happen but we can emit a warning */ /* We didn't find the PID in the list, that shouldn't happen but we can emit a warning */
ha_warning("Process %d exited with code %d (%s)\n", exitpid, status, (status >= 128) ? strsignal(status - 128) : "Exit"); ha_warning("Process %d exited with code %d (%s)\n", exitpid, status, (status >= 128) ? strsignal(status - 128) : "Exit");
} else if (child->options & PROC_O_INIT) { } else if (child->options & PROC_O_INIT) {
on_new_child_failure(); mworker_on_new_child_failure();
/* Detach all listeners */ /* Detach all listeners */
for (curproxy = proxies_list; curproxy; curproxy = curproxy->next) { for (curproxy = proxies_list; curproxy; curproxy = curproxy->next) {