Commit 5b2b752f authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Wait 10 seconds for varnish to call home.

Log PID of child process for aid logfile trawling



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@5416 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent acba595b
...@@ -304,6 +304,8 @@ varnish_launch(struct varnish *v) ...@@ -304,6 +304,8 @@ varnish_launch(struct varnish *v)
(void)close(i); (void)close(i);
AZ(execl("/bin/sh", "/bin/sh", "-c", vsb_data(vsb), NULL)); AZ(execl("/bin/sh", "/bin/sh", "-c", vsb_data(vsb), NULL));
exit(1); exit(1);
} else {
vtc_log(v->vl, 3, "PID: %d", v->pid);
} }
AZ(close(v->fds[0])); AZ(close(v->fds[0]));
AZ(close(v->fds[3])); AZ(close(v->fds[3]));
...@@ -315,7 +317,7 @@ varnish_launch(struct varnish *v) ...@@ -315,7 +317,7 @@ varnish_launch(struct varnish *v)
/* Wait for the varnish to call home */ /* Wait for the varnish to call home */
fd.fd = v->cli_fd; fd.fd = v->cli_fd;
fd.events = POLLIN; fd.events = POLLIN;
i = poll(&fd, 1, 6000); i = poll(&fd, 1, 10000);
if (i != 1) { if (i != 1) {
AZ(close(v->fds[1])); AZ(close(v->fds[1]));
(void)kill(v->pid, SIGKILL); (void)kill(v->pid, SIGKILL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment