r3933 - in trunk/varnish-cache: bin/varnishtest lib/libvarnish

[phk at projects.linpro.no]

Author: phk
Date: 2009-03-16 10:48:48 +0100 (Mon, 16 Mar 2009)
New Revision: 3933

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
   trunk/varnish-cache/lib/libvarnish/cli_common.c
Log:
Attempt even harder to get diag on cli issues



Modified: trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2009-03-16 09:17:10 UTC (rev 3932)
+++ trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2009-03-16 09:48:48 UTC (rev 3933)
@@ -97,7 +97,7 @@
 	assert(i == strlen(cmd));
 	i = write(v->cli_fd, "\n", 1);
 	assert(i == 1);
-	i = cli_readres(v->cli_fd, &retval, &r, 10.0);
+	i = cli_readres(v->cli_fd, &retval, &r, 20.0);
 	if (i != 0) {
 		vtc_log(v->vl, 0, "CLI failed (%s) = %d %u %s",
 		    cmd, i, retval, r);
@@ -295,8 +295,12 @@
 		return;
 	vtc_log(v->vl, 2, "Start");
 	u = varnish_ask_cli(v, "start", NULL);
+	if (vtc_error)
+		return;
 	assert(u == CLIS_OK);
 	u = varnish_ask_cli(v, "debug.xid 1000", NULL);
+	if (vtc_error)
+		return;
 	assert(u == CLIS_OK);
 }
 

Modified: trunk/varnish-cache/lib/libvarnish/cli_common.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/cli_common.c	2009-03-16 09:17:10 UTC (rev 3932)
+++ trunk/varnish-cache/lib/libvarnish/cli_common.c	2009-03-16 09:48:48 UTC (rev 3933)
@@ -164,7 +164,9 @@
 		*status = CLIS_COMMS;
 		if (ptr != NULL)
 			*ptr = strdup("CLI communication error (hdr)");
-		return (1);
+		if (i != 0)
+			return (i);
+		return (400);
 	}
 	assert(i == CLI_LINE0_LEN);
 	assert(res[3] == ' ');