[4.1] 08fb539 Don't attempt to check if varnishd is still running if we have already failed.

PÃ¥l Hermunn Johansen hermunn at varnish-software.com
Mon Apr 24 16:34:06 CEST 2017


commit 08fb539150e9ca34b3c3388d6cae8d0b289519f1
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Apr 7 16:23:06 2017 +0000

    Don't attempt to check if varnishd is still running if we have
    already failed.
    
    Fixes #2301

diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 93b366c..bbfea18 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -667,8 +667,10 @@ varnish_wait(struct varnish *v)
 
 	vtc_log(v->vl, 2, "Wait");
 
-	/* Do a backend.list to log if child is still running */
-	varnish_ask_cli(v, "backend.list", &resp);
+	if (!vtc_error) {
+		/* Do a backend.list to log if child is still running */
+		varnish_ask_cli(v, "backend.list", &resp);
+	}
 
 	/* Then stop it */
 	varnish_stop(v);



More information about the varnish-commit mailing list