r2733 - trunk/varnish-cache/bin/varnishtest

[phk at projects.linpro.no]

Author: phk
Date: 2008-06-17 22:52:00 +0200 (Tue, 17 Jun 2008)
New Revision: 2733

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
Log:
Add -cli command.

Always reset XID to 1000 on start.



Modified: trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2008-06-17 20:46:29 UTC (rev 2732)
+++ trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2008-06-17 20:52:00 UTC (rev 2733)
@@ -239,11 +239,15 @@
 static void
 varnish_start(struct varnish *v)
 {
+	unsigned u;
 
 	if (v->cli_fd < 0)
 		varnish_launch(v);
 	printf("##   %-4s Start\n", v->name);
-	varnish_ask_cli(v, "start", NULL);
+	u = varnish_ask_cli(v, "start", NULL);
+	assert(u == CLIS_OK);
+	u = varnish_ask_cli(v, "debug.xid 1000", NULL);
+	assert(u == CLIS_OK);
 }
 
 /**********************************************************************
@@ -286,6 +290,21 @@
 }
 
 /**********************************************************************
+ * Ask a CLI question
+ */
+
+static void
+varnish_cli(struct varnish *v, const char *cli)
+{
+	unsigned u;
+
+	if (v->cli_fd < 0)
+		varnish_launch(v);
+	u = varnish_ask_cli(v, cli, NULL);
+	printf("##   %-4s CLI %03u <%s>\n", v->name, u, cli);
+}
+
+/**********************************************************************
  * Load a VCL program
  */
 
@@ -433,6 +452,11 @@
 			av++;
 			continue;
 		}
+		if (!strcmp(*av, "-cli")) {
+			varnish_cli(v, av[1]);
+			av++;
+			continue;
+		}
 		if (!strcmp(*av, "-launch")) {
 			varnish_launch(v);
 			continue;