Skip to content

Commit 321c021

Browse files
einval22wlallemand
authored andcommitted
MINOR: startup: rename on_new_child_failure to mworker_on_new_child_failure
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.
1 parent 10c14a1 commit 321c021

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

include/haproxy/global.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void display_version();
6868

6969
void mworker_accept_wrapper(int fd);
7070
void mworker_reload(int hardreload);
71-
void on_new_child_failure(void);
71+
void mworker_on_new_child_failure(void);
7272

7373
/* to be used with warned and WARN_* */
7474
static inline int already_warned(unsigned int warning)

src/haproxy.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -915,9 +915,10 @@ static void mworker_loop()
915915
}
916916

917917
/*
918-
* Reexec the process in failure mode, instead of exiting
918+
* Performs some routines for the worker process, which has failed the reload,
919+
* updates the global load_status.
919920
*/
920-
void on_new_child_failure()
921+
void mworker_on_new_child_failure()
921922
{
922923
struct mworker_proc *child;
923924

src/mworker.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ void mworker_catch_sigchld(struct sig_handler *sh)
356356
/* We didn't find the PID in the list, that shouldn't happen but we can emit a warning */
357357
ha_warning("Process %d exited with code %d (%s)\n", exitpid, status, (status >= 128) ? strsignal(status - 128) : "Exit");
358358
} else if (child->options & PROC_O_INIT) {
359-
on_new_child_failure();
359+
mworker_on_new_child_failure();
360360

361361
/* Detach all listeners */
362362
for (curproxy = proxies_list; curproxy; curproxy = curproxy->next) {

0 commit comments

Comments
 (0)