From: William Lallemand <wlallemand@haproxy.com>
Date: Wed, 15 Nov 2017 18:02:55 +0000 (+0100)
Subject: MINOR: mworker: display an accurate error when the reexec fail
X-Git-Tag: v1.8-rc4~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=722d4ca0dd66aadf297b43296456289ef3b0f9da;p=thirdparty%2Fhaproxy.git

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.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index b4f6a4f880..28811a84f9 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");
 }