[master] e914a75 CLI errors are not fatal if we are in shutdown

Poul-Henning Kamp phk at FreeBSD.org
Mon Feb 13 15:05:06 CET 2017


commit e914a75073582c3b504c8705a636e854001d57bd
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Feb 13 12:06:33 2017 +0000

    CLI errors are not fatal if we are in shutdown

diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 76a78d4..6fcf683 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -116,7 +116,7 @@ varnish_ask_cli(const struct varnish *v, const char *cmd, char **repl)
 			    cmd, errno, strerror(errno));
 	}
 	i = VCLI_ReadResult(v->cli_fd, &retval, &r, vtc_maxdur);
-	if (i != 0)
+	if (i != 0 && !vtc_stop)
 		vtc_fatal(v->vl, "CLI failed (%s) = %d %u %s",
 		    cmd, i, retval, r);
 	AZ(i);



More information about the varnish-commit mailing list