RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-17 02:56:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: mworker: clarify starting/failure messages

Browse Source 
Clarify the startup and reload messages:

On a successful configuration load, haproxy will emit "Loading success."
after successfuly forked the children.

When it didn't success to load the configuration it will emit "Loading failure!".

When trying to reload the master process, it will emit "Reloading
HAProxy".
This commit is contained in:
William Lallemand 2021-11-09 18:16:47 +01:00
parent fab0fdce98
commit 836bda226c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/haproxy.c
View File

@ -777,10 +777,8 @@ static void mworker_reexec()
for (i = 1; i < old_argc; i++)
next_argv[next_argc++] = old_argv[i];
ha_warning("Reexecuting Master process\n");
signal(SIGPROF, SIG_IGN);
execvp(next_argv[0], next_argv);
ha_warning("Failed to reexecute the master process [%d]: %s\n", pid, strerror(errno));
ha_free(&next_argv);
return;
@ -801,6 +799,7 @@ static void mworker_reexec_waitmode()
/* reload haproxy and emit a warning */
void mworker_reload()
{
ha_notice("Reloading HAProxy\n");
mworker_reexec();
}
@ -859,8 +858,8 @@ void reexec_on_failure()
{
if (!atexit_flag)
return;
ha_warning("Reexecuting Master process in waitpid mode\n");
usermsgs_clr(NULL);
ha_warning("Loading failure!\n");
mworker_reexec_waitmode();
}
@ -3260,6 +3259,7 @@ int main(int argc, char **argv)
} else {
/* if not in wait mode, reload in wait mode to free the memory */
ha_notice("Loading success.\n");
mworker_reexec_waitmode();
}
/* should never get there */