[master] 62d9622 Don't attempt to check if varnishd is still running if we have already failed.

Poul-Henning Kamp phk at FreeBSD.org
Fri Apr 7 18:28:05 CEST 2017


commit 62d96228556f15cc63b560f9ef34f70a7ab0e4cc
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 31ab631..22b0307 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -663,8 +663,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