r5416 - trunk/varnish-cache/bin/varnishtest

[phk at varnish-cache.org]

Author: phk
Date: 2010-10-06 20:08:53 +0200 (Wed, 06 Oct 2010)
New Revision: 5416

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
Log:
Wait 10 seconds for varnish to call home.
Log PID of child process for aid logfile trawling



Modified: trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2010-10-06 18:08:13 UTC (rev 5415)
+++ trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2010-10-06 18:08:53 UTC (rev 5416)
@@ -304,6 +304,8 @@
 			(void)close(i);
 		AZ(execl("/bin/sh", "/bin/sh", "-c", vsb_data(vsb), NULL));
 		exit(1);
+	} else {
+		vtc_log(v->vl, 3, "PID: %d", v->pid);
 	}
 	AZ(close(v->fds[0]));
 	AZ(close(v->fds[3]));
@@ -315,7 +317,7 @@
 	/* Wait for the varnish to call home */
 	fd.fd = v->cli_fd;
 	fd.events = POLLIN;
-	i = poll(&fd, 1, 6000);
+	i = poll(&fd, 1, 10000);
 	if (i != 1) {
 		AZ(close(v->fds[1]));
 		(void)kill(v->pid, SIGKILL);