Commit 2b0c4db8 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Add a test-case to check the master process signal handling

parent 750e6a80
varnishtest "Test/coverage of varnish master signal handling"
server s1 {
rxreq
txresp
} -start
varnish v1 -vcl+backend { } -start
client c1 {
txreq
rxresp
} -run
server s1 -wait
shell "kill -15 ${v1_pid}"
...@@ -384,7 +384,7 @@ varnish_launch(struct varnish *v) ...@@ -384,7 +384,7 @@ varnish_launch(struct varnish *v)
vsb = VSB_new_auto(); vsb = VSB_new_auto();
AN(vsb); AN(vsb);
VSB_printf(vsb, "cd ${pwd} &&"); VSB_printf(vsb, "cd ${pwd} &&");
VSB_printf(vsb, " ${varnishd} -d -d -n %s", v->workdir); VSB_printf(vsb, "exec ${varnishd} -d -d -n %s", v->workdir);
VSB_printf(vsb, " -l 2m,1m,-"); VSB_printf(vsb, " -l 2m,1m,-");
VSB_printf(vsb, " -p auto_restart=off"); VSB_printf(vsb, " -p auto_restart=off");
VSB_printf(vsb, " -p syslog_cli_traffic=off"); VSB_printf(vsb, " -p syslog_cli_traffic=off");
...@@ -420,6 +420,7 @@ varnish_launch(struct varnish *v) ...@@ -420,6 +420,7 @@ varnish_launch(struct varnish *v)
exit(1); exit(1);
} else { } else {
vtc_log(v->vl, 3, "PID: %ld", (long)v->pid); vtc_log(v->vl, 3, "PID: %ld", (long)v->pid);
macro_def(v->vl, v->name, "pid", "%ld", (long)v->pid);
} }
AZ(close(v->fds[0])); AZ(close(v->fds[0]));
AZ(close(v->fds[3])); AZ(close(v->fds[3]));
...@@ -462,7 +463,6 @@ varnish_launch(struct varnish *v) ...@@ -462,7 +463,6 @@ varnish_launch(struct varnish *v)
vtc_log(v->vl, 3, "CLI connection fd = %d", v->cli_fd); vtc_log(v->vl, 3, "CLI connection fd = %d", v->cli_fd);
assert(v->cli_fd >= 0); assert(v->cli_fd >= 0);
/* Receive the banner or auth response */ /* Receive the banner or auth response */
u = varnish_ask_cli(v, NULL, &r); u = varnish_ask_cli(v, NULL, &r);
if (vtc_error) if (vtc_error)
......
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