Skip to content

V
varnish-cache
Commit b2155ae4 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Make sure daemonized haproxy processes gets killed

parent 401d1dd9
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
bin/varnishtest/vtc_haproxy.c
View file @ b2155ae4
......@@ -327,15 +327,16 @@ haproxy_wait(struct haproxy *h)
sig = SIGINT;
n = 0;
vtc_log(h->vl, 2, "Stop HAproxy pid=%ld", (long)h->pid);
while (!h->opt_check_mode && !h->its_dead_jim) {
while (h->opt_daemon || (!h->opt_check_mode && !h->its_dead_jim)) {
assert(h->pid > 0);
if (n == 0) {
i= kill(h->pid, sig);
vtc_log(h->vl, 4,
"Kill(%d)=%d: %s", sig, i, strerror(errno));
h->expect_signal = -sig;
i = kill(h->pid, sig);
if (i == 0)
h->expect_signal = -sig;
if (i && errno == ESRCH)
break;
vtc_log(h->vl, 4,
"Kill(%d)=%d: %s", sig, i, strerror(errno));
}
usleep(100000);
if (++n == 20) {
......
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