[4.1] 6a38516 Use global -t timeout for CLI timeout

Lasse Karstensen lkarsten at varnish-software.com
Thu Feb 11 17:14:33 CET 2016


commit 6a38516a4fdaf51a6be3b6b8196b81566de766a6
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Feb 8 11:44:34 2016 +0000

    Use global -t timeout for CLI timeout

diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 91c4072..1ff780f 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -109,7 +109,7 @@ varnish_ask_cli(const struct varnish *v, const char *cmd, char **repl)
 			vtc_log(v->vl, 0, "CLI write failed (%s) = %u %s",
 			    cmd, errno, strerror(errno));
 	}
-	i = VCLI_ReadResult(v->cli_fd, &retval, &r, 30.0);
+	i = VCLI_ReadResult(v->cli_fd, &retval, &r, vtc_maxdur);
 	if (i != 0) {
 		vtc_log(v->vl, 0, "CLI failed (%s) = %d %u %s",
 		    cmd, i, retval, r);



More information about the varnish-commit mailing list