[master] 30ef1f0 Don't kill varnishd process before it has a chance to tell us its trouble
Poul-Henning Kamp
phk at varnish-cache.org
Tue Jan 25 11:15:39 CET 2011
commit 30ef1f0a6f448376bc36aa61de51a1d0f24293ed
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Tue Jan 25 09:54:50 2011 +0000
Don't kill varnishd process before it has a chance to tell us its trouble
diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 1daf6dc..dd59251 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -305,15 +305,11 @@ varnish_launch(struct varnish *v)
fd.events = POLLIN;
i = poll(&fd, 1, 10000);
if (i != 1) {
- AZ(close(v->fds[1]));
- (void)kill(v->pid, SIGKILL);
vtc_log(v->vl, 0, "FAIL timeout waiting for CLI connection");
return;
}
nfd = accept(v->cli_fd, NULL, NULL);
if (nfd < 0) {
- AZ(close(v->fds[1]));
- (void)kill(v->pid, SIGKILL);
vtc_log(v->vl, 0, "FAIL no CLI connection accepted");
return;
}
More information about the varnish-commit
mailing list