Commit 30ef1f0a authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Don't kill varnishd process before it has a chance to tell us its trouble

parent 8b9e46f8
...@@ -305,15 +305,11 @@ varnish_launch(struct varnish *v) ...@@ -305,15 +305,11 @@ varnish_launch(struct varnish *v)
fd.events = POLLIN; fd.events = POLLIN;
i = poll(&fd, 1, 10000); i = poll(&fd, 1, 10000);
if (i != 1) { if (i != 1) {
AZ(close(v->fds[1]));
(void)kill(v->pid, SIGKILL);
vtc_log(v->vl, 0, "FAIL timeout waiting for CLI connection"); vtc_log(v->vl, 0, "FAIL timeout waiting for CLI connection");
return; return;
} }
nfd = accept(v->cli_fd, NULL, NULL); nfd = accept(v->cli_fd, NULL, NULL);
if (nfd < 0) { if (nfd < 0) {
AZ(close(v->fds[1]));
(void)kill(v->pid, SIGKILL);
vtc_log(v->vl, 0, "FAIL no CLI connection accepted"); vtc_log(v->vl, 0, "FAIL no CLI connection accepted");
return; return;
} }
......
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