r3930 - trunk/varnish-cache/bin/varnishtest

[phk at projects.linpro.no]

Author: phk
Date: 2009-03-16 09:53:36 +0100 (Mon, 16 Mar 2009)
New Revision: 3930

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
Log:
Trap cli failures



Modified: trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2009-03-16 08:50:01 UTC (rev 3929)
+++ trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2009-03-16 08:53:36 UTC (rev 3930)
@@ -98,9 +98,13 @@
 	i = write(v->cli_fd, "\n", 1);
 	assert(i == 1);
 	i = cli_readres(v->cli_fd, &retval, &r, 10.0);
+	if (i != 0) {
+		vtc_log(v->vl, 0, "CLI failed (%s) %d", cmd, i);
+		return (CLIS_COMMS);
+	}
 	assert(i == 0);
 	vtc_dump(v->vl, 4, "CLI RX", r);
-	vtc_log(v->vl, 3, "CLI STATUS %u", retval);
+	vtc_log(v->vl, 3, "CLI STATUS (%s) %u", cmd, retval);
 	if (repl != NULL)
 		*repl = r;
 	else