[master] f69b4ae Report if killing haproxy fails

Poul-Henning Kamp phk at FreeBSD.org
Fri Apr 6 21:43:11 UTC 2018


commit f69b4ae7d3e70eaa4c34a0d6454fe8c334f07b00
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Apr 6 21:41:46 2018 +0000

    Report if killing haproxy fails

diff --git a/bin/varnishtest/vtc_haproxy.c b/bin/varnishtest/vtc_haproxy.c
index f8eec12..21a6cb3 100644
--- a/bin/varnishtest/vtc_haproxy.c
+++ b/bin/varnishtest/vtc_haproxy.c
@@ -324,6 +324,9 @@ haproxy_wait(struct haproxy *h)
 		vtc_log(h->vl, 2, "Stop HAproxy pid=%ld", (long)h->pid);
 		h->kill_status = kill(h->pid, HAPROXY_SIGNAL);
 		h->kill_errno = errno;
+		if (h->kill_status)
+			vtc_log(h->vl, 4, "Kill=%d: %s",
+			    h->kill_status, strerror(h->kill_errno));
 		h->expect_signal = -HAPROXY_SIGNAL;
 		// XXX: loop over kills to ESRCH ?
 	}


More information about the varnish-commit mailing list