From 722d4ca0dd66aadf297b43296456289ef3b0f9da Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Wed, 15 Nov 2017 19:02:55 +0100 Subject: [PATCH] MINOR: mworker: display an accurate error when the reexec fail 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. --- src/haproxy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/haproxy.c b/src/haproxy.c index b4f6a4f88..28811a84f 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -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"); }