RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-10 07:49:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: mworker: display an accurate error when the reexec fail

Browse Source 
When the master worker fail the execvp, it returns the wrong error
"Cannot allocate memory".

We now display the accurate error corresponding to the errno value.
This commit is contained in:
William Lallemand 2017-11-15 19:02:55 +01:00 committed by Willy Tarreau
parent 6d889500e2
commit 722d4ca0dd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/haproxy.c
View File

@ -652,9 +652,11 @@ static void mworker_reload()
Warning("Reexecuting Master process\n");
execvp(next_argv[0], next_argv);
Warning("Failed to reexecute the master process [%d]: %s\n", pid, strerror(errno));
return;
alloc_error:
Warning("Cannot allocate memory\n");
Warning("Failed to reexecute the master processs [%d]\n", pid);
Warning("Failed to reexecute the master processs [%d]: Cannot allocate memory\n", pid);
return;
}
@ -732,8 +734,6 @@ void reexec_on_failure()
Warning("Reexecuting Master process in waitpid mode\n");
mworker_reload();
Warning("Failed to reexecute the master processs\n");
}