[master] 2abd431 Eliminate arguments inherited from vtc_varnish's two-process handling.
Poul-Henning Kamp
phk at FreeBSD.org
Thu Mar 29 13:55:13 UTC 2018
commit 2abd4310090304d79c9be0a5919c227071ba9809
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Thu Mar 29 13:06:38 2018 +0000
Eliminate arguments inherited from vtc_varnish's two-process
handling.
diff --git a/bin/varnishtest/vtc_haproxy.c b/bin/varnishtest/vtc_haproxy.c
index 4094ec0..d9c0350 100644
--- a/bin/varnishtest/vtc_haproxy.c
+++ b/bin/varnishtest/vtc_haproxy.c
@@ -588,11 +588,6 @@ cmd_haproxy(CMD_ARGS)
av++;
continue;
}
- if (!strcmp(*av, "-cleanup")) {
- AZ(av[1]);
- haproxy_cleanup(h, 0);
- continue;
- }
if (!strcmp(*av, "-conf")) {
AN(av[1]);
haproxy_write_conf(h, av[1], 0);
@@ -614,18 +609,10 @@ cmd_haproxy(CMD_ARGS)
haproxy_start(h);
continue;
}
- if (!strcmp(*av, "-stop")) {
- haproxy_stop(h);
- continue;
- }
- if (!strcmp(*av, "-wait-stopped")) {
+ if (!strcmp(*av, "-wait")) {
wait_stopped(h);
continue;
}
- if (!strcmp(*av, "-wait-running")) {
- wait_running(h);
- continue;
- }
vtc_fatal(h->vl, "Unknown haproxy argument: %s", *av);
}
}
More information about the varnish-commit
mailing list