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

[phk at projects.linpro.no]

Author: phk
Date: 2009-03-16 10:01:19 +0100 (Mon, 16 Mar 2009)
New Revision: 3931

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
   trunk/varnish-cache/lib/libvarnish/cli_common.c
Log:
Attempt even better cli failure diagnostics



Modified: trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2009-03-16 08:53:36 UTC (rev 3930)
+++ trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2009-03-16 09:01:19 UTC (rev 3931)
@@ -99,8 +99,9 @@
 	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);
+		vtc_log(v->vl, 0, "CLI failed (%s) = %d %u %s",
+		    cmd, i, retval, r);
+		return (retval);
 	}
 	assert(i == 0);
 	vtc_dump(v->vl, 4, "CLI RX", r);

Modified: trunk/varnish-cache/lib/libvarnish/cli_common.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/cli_common.c	2009-03-16 08:53:36 UTC (rev 3930)
+++ trunk/varnish-cache/lib/libvarnish/cli_common.c	2009-03-16 09:01:19 UTC (rev 3931)
@@ -163,7 +163,7 @@
 	if (i != CLI_LINE0_LEN) {
 		*status = CLIS_COMMS;
 		if (ptr != NULL)
-			*ptr = strdup("CLI communication error");
+			*ptr = strdup("CLI communication error (hdr)");
 		return (1);
 	}
 	assert(i == CLI_LINE0_LEN);
@@ -179,6 +179,8 @@
 	if (i < 0) {
 		*status = CLIS_COMMS;
 		free(p);
+		if (ptr != NULL)
+			*ptr = strdup("CLI communication error (body)");
 		return (i);
 	}
 	assert(i == v + 1);