MEDIUM: proxy: remove start_proxies()
Its sole remaining purpose was to display "proxy foo started", which
has little benefit and pollutes output for those with plenty of proxies.
Let's remove it now.
The VTCs were updated to reflect this, because many of them had explicit
counts of dropped lines to match this message.
This is tagged as MEDIUM because some users may be surprized by the
loss of this quite old message.
diff --git a/reg-tests/checks/1be_40srv_odd_health_checks.vtc b/reg-tests/checks/1be_40srv_odd_health_checks.vtc
index a2a659b..44edfe5 100644
--- a/reg-tests/checks/1be_40srv_odd_health_checks.vtc
+++ b/reg-tests/checks/1be_40srv_odd_health_checks.vtc
@@ -10,10 +10,9 @@
#EXCLUDE_TARGETS=freebsd
#REGTEST_TYPE=slow
-# Note that the first syslog message received is: "Proxy <name> started."
-syslog S -repeat 21 -level notice {
+syslog S -repeat 20 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: (Health check for server be1/srv([13579]|[123][13579]) succeeded.+reason: Layer4 check passed.+check duration: [[:digit:]]+ms.+status: 1/1 UP|Proxy be1 started.)"
+ expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be1/srv([13579]|[123][13579]) succeeded.+reason: Layer4 check passed.+check duration: [[:digit:]]+ms.+status: 1/1 UP"
} -start
server s0 {} -start
diff --git a/reg-tests/checks/40be_2srv_odd_health_checks.vtc b/reg-tests/checks/40be_2srv_odd_health_checks.vtc
index eaa8355..9cc6279 100644
--- a/reg-tests/checks/40be_2srv_odd_health_checks.vtc
+++ b/reg-tests/checks/40be_2srv_odd_health_checks.vtc
@@ -15,144 +15,103 @@
# (any varnishtest server without -repeat <n> with n > 1 accepts
# only one connection).
-# Note that the first syslog message received is: "Proxy <name> started."
syslog S1 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be1 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be1/srv1 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S3 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be3 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be3/srv3 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S5 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be5 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be5/srv5 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S7 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be7 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be7/srv7 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S9 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be9 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be9/srv9 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S11 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be11 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be11/srv11 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S13 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be13 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be13/srv13 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S15 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be15 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be15/srv15 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S17 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be17 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be17/srv17 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S19 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be19 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be19/srv19 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S21 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be21 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be21/srv21 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S23 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be23 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be23/srv23 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S25 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be25 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be25/srv25 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S27 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be27 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be27/srv27 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S29 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be29 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be29/srv29 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S31 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be31 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be31/srv31 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S33 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be33 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be33/srv33 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S35 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be35 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be35/srv35 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S37 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be37 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be37/srv37 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
syslog S39 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be39 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be39/srv39 succeeded, reason: Layer4 check passed, check duration: [[:digit:]]+ms, status: 1/1 UP"
} -start
diff --git a/reg-tests/checks/4be_1srv_health_checks.vtc b/reg-tests/checks/4be_1srv_health_checks.vtc
index ec72d90..98827aa 100644
--- a/reg-tests/checks/4be_1srv_health_checks.vtc
+++ b/reg-tests/checks/4be_1srv_health_checks.vtc
@@ -37,8 +37,6 @@
syslog S1 -level notice {
recv
- expect ~ "Proxy be1 started"
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be1/srv1 succeeded.+reason: Layer4 check passed.+check duration: [[:digit:]]+ms.+status: 1/1 UP"
barrier b1 sync
recv alert
@@ -53,8 +51,6 @@
syslog S2 -level notice {
recv
- expect ~ "Proxy be2 started"
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be2/srv2 succeeded.+reason: Layer4 check passed.+check duration: [[:digit:]]+ms.+status: 1/1 UP"
barrier b1 sync
recv alert
@@ -69,8 +65,6 @@
syslog S3 -level notice {
recv
- expect ~ "Proxy be3 started"
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be3/srv3 succeeded.+reason: Layer4 check passed.+check duration: [[:digit:]]+ms.+status: 1/1 UP"
barrier b1 sync
recv alert
@@ -85,8 +79,6 @@
syslog S4 -level notice {
recv
- expect ~ "Proxy be4 started"
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be4/srv4 succeeded.+reason: Layer4 check passed.+check duration: [[:digit:]]+ms.+status: 1/1 UP"
barrier b1 sync
recv alert
diff --git a/reg-tests/checks/4be_1srv_smtpchk_httpchk_layer47errors.vtc b/reg-tests/checks/4be_1srv_smtpchk_httpchk_layer47errors.vtc
index a226f46..f9f37a1 100644
--- a/reg-tests/checks/4be_1srv_smtpchk_httpchk_layer47errors.vtc
+++ b/reg-tests/checks/4be_1srv_smtpchk_httpchk_layer47errors.vtc
@@ -8,8 +8,6 @@
syslog S1 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be1 started"
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be1/srv1 succeeded.+reason: Layer7 check passed.+code: 2(20|48).+check duration: [[:digit:]]+ms.+status: 1/1 UP."
barrier b sync
recv
@@ -18,8 +16,6 @@
syslog S2 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be2 started"
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be2/srv2 succeeded.+reason: Layer7 check passed.+code: 200.+.+check duration: [[:digit:]]+ms.+status: 1/1 UP."
barrier b sync
recv
@@ -28,15 +24,11 @@
syslog S3 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be3 started"
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be3/srv3 failed.+reason: Layer4 connection problem.+info: \"General socket error \\(Network is unreachable\\)\".+check duration: [[:digit:]]+ms.+status: 0/1 DOWN."
} -start
syslog S4 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be4 started"
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be4/srv4 failed.+reason: Layer4 connection problem.+info: \"Connection refused\".+check duration: [[:digit:]]+ms.+status: 0/1 DOWN."
} -start
diff --git a/reg-tests/checks/http-check-expect.vtc b/reg-tests/checks/http-check-expect.vtc
index ab629db..12f86d9 100644
--- a/reg-tests/checks/http-check-expect.vtc
+++ b/reg-tests/checks/http-check-expect.vtc
@@ -21,8 +21,6 @@
syslog S1 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be1 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be1/srv succeeded.*code: 202"
} -start
diff --git a/reg-tests/checks/http-check-send.vtc b/reg-tests/checks/http-check-send.vtc
index 05f09a8..179e149 100644
--- a/reg-tests/checks/http-check-send.vtc
+++ b/reg-tests/checks/http-check-send.vtc
@@ -66,36 +66,26 @@
syslog S1 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be1 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be1/srv succeeded.*code: 200"
} -start
syslog S2 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be2 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be2/srv succeeded.*code: 200"
} -start
syslog S3 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be3 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be3/srv succeeded.*code: 200"
} -start
syslog S4 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be4 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be4/srv succeeded.*code: 200"
} -start
syslog S5 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be5 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be5/srv succeeded.*code: 200"
} -start
diff --git a/reg-tests/checks/http-check.vtc b/reg-tests/checks/http-check.vtc
index 27ad474..1180c3d 100644
--- a/reg-tests/checks/http-check.vtc
+++ b/reg-tests/checks/http-check.vtc
@@ -75,15 +75,6 @@
syslog S1 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be[0-9]+ started."
- recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be[0-9]+ started."
- recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be[0-9]+ started."
- recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be[0-9]+ started."
-
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be[0-9]/srv succeeded.*code: 200"
recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be[0-9]/srv succeeded.*code: 200"
diff --git a/reg-tests/checks/ldap-check.vtc b/reg-tests/checks/ldap-check.vtc
index 51fa720..4c0db11 100644
--- a/reg-tests/checks/ldap-check.vtc
+++ b/reg-tests/checks/ldap-check.vtc
@@ -25,22 +25,16 @@
syslog S1 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be1 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be1/srv succeeded, reason: Layer7 check passed.+info: \"Success\".+check duration: [[:digit:]]+ms, status: 1/1 UP."
} -start
syslog S2 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be2 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be2/srv failed, reason: Layer7 invalid response.+info: \"Not LDAPv3 protocol\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
} -start
syslog S3 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be3 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be3/srv failed, reason: Layer7 wrong status.+code: 1.+info: \"See RFC: http://tools.ietf.org/html/rfc4511#section-4.1.9\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
} -start
diff --git a/reg-tests/checks/mysql-check.vtc b/reg-tests/checks/mysql-check.vtc
index 5344d95..2d20714 100644
--- a/reg-tests/checks/mysql-check.vtc
+++ b/reg-tests/checks/mysql-check.vtc
@@ -39,36 +39,26 @@
syslog S1 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be1 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be1/srv succeeded, reason: Layer7 check passed.+info: \"8.0.19\".+check duration: [[:digit:]]+ms, status: 1/1 UP."
} -start
syslog S2 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be2 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be2/srv succeeded, reason: Layer7 check passed.+info: \"8.0.19\".+check duration: [[:digit:]]+ms, status: 1/1 UP."
} -start
syslog S3 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be3 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be3/srv succeeded, reason: Layer7 check passed.+info: \"8.0.19\".+check duration: [[:digit:]]+ms, status: 1/1 UP."
} -start
syslog S4 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be4 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be4/srv failed, reason: Layer7 wrong status.+code: 1251.+info: \"Client does not support authentication protocol requested by server; consider upgrading MySQL client\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
} -start
syslog S5 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be5 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be5/srv failed, reason: Layer7 wrong status.+code: 1251.+info: \"Client does not support authentication protocol requested by server; consider upgrading MySQL client\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
} -start
diff --git a/reg-tests/checks/pgsql-check.vtc b/reg-tests/checks/pgsql-check.vtc
index 4620d6f..968a18c 100644
--- a/reg-tests/checks/pgsql-check.vtc
+++ b/reg-tests/checks/pgsql-check.vtc
@@ -25,22 +25,16 @@
syslog S1 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be1 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be1/srv succeeded, reason: Layer7 check passed.+info: \"PostgreSQL server is ok\".+check duration: [[:digit:]]+ms, status: 1/1 UP."
} -start
syslog S2 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be2 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be2/srv failed, reason: Layer7 invalid response.+info: \"FATAL\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
} -start
syslog S3 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be3 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be3/srv failed, reason: Layer7 wrong status.+info: \"PostgreSQL unknown error\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
} -start
diff --git a/reg-tests/checks/redis-check.vtc b/reg-tests/checks/redis-check.vtc
index a9c85cb..c6d4fe4 100644
--- a/reg-tests/checks/redis-check.vtc
+++ b/reg-tests/checks/redis-check.vtc
@@ -20,15 +20,11 @@
syslog S1 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be1 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be1/srv succeeded, reason: Layer7 check passed.+info: \"Redis server is ok\".+check duration: [[:digit:]]+ms, status: 1/1 UP."
} -start
syslog S2 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be2 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be2/srv failed, reason: Layer7 wrong status.+info: \"-Error message\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
} -start
diff --git a/reg-tests/checks/smtp-check.vtc b/reg-tests/checks/smtp-check.vtc
index ab24b0c..29d0ddb 100644
--- a/reg-tests/checks/smtp-check.vtc
+++ b/reg-tests/checks/smtp-check.vtc
@@ -36,36 +36,26 @@
syslog S1 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be1 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be1/srv succeeded, reason: Layer7 check passed.+code: 250.+info: \"smtp-check.vtc\".+check duration: [[:digit:]]+ms, status: 1/1 UP."
} -start
syslog S2 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be2 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be2/srv succeeded, reason: Layer7 check passed.+code: 250.+info: \"smtp-check.vtc\".+check duration: [[:digit:]]+ms, status: 1/1 UP."
} -start
syslog S3 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be3 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be3/srv failed, reason: Layer7 invalid response.+info: \"I'm not a SMTP server\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
} -start
syslog S4 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be4 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be4/srv failed, reason: Layer7 wrong status.+code: 421.+info: \"Try again later\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
} -start
syslog S5 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be5 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be5/srv failed, reason: Layer7 wrong status.+code: 512.+info: \"DNS error\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
} -start
diff --git a/reg-tests/checks/spop-check.vtc b/reg-tests/checks/spop-check.vtc
index 8446c77..c6b704b 100644
--- a/reg-tests/checks/spop-check.vtc
+++ b/reg-tests/checks/spop-check.vtc
@@ -30,29 +30,21 @@
syslog S1 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be1 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be1/srv succeeded, reason: Layer7 check passed.+info: \"SPOA server is ok\".+check duration: [[:digit:]]+ms, status: 1/1 UP."
} -start
syslog S2 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be2 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be2/srv failed, reason: Layer7 invalid response.+info: \"invalid frame received\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
} -start
syslog S3 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be3 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be3/srv failed, reason: Layer7 invalid response.+info: \"fragmentation not supported\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
} -start
syslog S4 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be4 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be4/srv failed, reason: Layer7 invalid response.+info: \"unsupported version\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
} -start
diff --git a/reg-tests/checks/ssl-hello-check.vtc b/reg-tests/checks/ssl-hello-check.vtc
index c4b0b53..7f8d9b9 100644
--- a/reg-tests/checks/ssl-hello-check.vtc
+++ b/reg-tests/checks/ssl-hello-check.vtc
@@ -9,23 +9,17 @@
syslog S1 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be1 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be1/srv succeeded, reason: Layer6 check passed.+check duration: [[:digit:]]+ms, status: 1/1 UP."
} -start
syslog S2 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be2 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be2/srv failed, reason: Layer6 invalid response.+info: \"TCPCHK got an empty response at step 2\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
} -start
syslog S3 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be3 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be3/srv failed, reason: Layer6 invalid response.+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
} -start
diff --git a/reg-tests/checks/tcp-check-ssl.vtc b/reg-tests/checks/tcp-check-ssl.vtc
index 149bf7a..02dc6f0 100644
--- a/reg-tests/checks/tcp-check-ssl.vtc
+++ b/reg-tests/checks/tcp-check-ssl.vtc
@@ -6,17 +6,6 @@
syslog S_ok -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be[0-9]+ started."
- recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be[0-9]+ started."
- recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be[0-9]+ started."
- recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be[0-9]+ started."
- recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be[0-9]+ started."
-
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be[0-9]+/srv succeeded, reason: Layer6 check passed.+check duration: [[:digit:]]+ms, status: 1/1 UP."
recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be[0-9]+/srv succeeded, reason: Layer6 check passed.+check duration: [[:digit:]]+ms, status: 1/1 UP."
@@ -30,15 +19,11 @@
syslog S3 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be3 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be3/srv failed, reason: Layer6 invalid response.+info: \"(Connection closed during SSL handshake|SSL handshake failure)\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
} -start
syslog S4 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be4 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be4/srv failed, reason: Layer6 invalid response.+info: \"(Connection closed during SSL handshake|SSL handshake failure) at step 1 of tcp-check \\(connect\\)\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN."
} -start
diff --git a/reg-tests/checks/tcp-check_min-recv.vtc b/reg-tests/checks/tcp-check_min-recv.vtc
index 61ff3c8..370c946 100644
--- a/reg-tests/checks/tcp-check_min-recv.vtc
+++ b/reg-tests/checks/tcp-check_min-recv.vtc
@@ -8,15 +8,11 @@
syslog S1 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be1 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be1/srv1 failed, reason: Layer7 timeout.*at step 2 of tcp-check"
} -start
syslog S2 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be2 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be2/srv1 succeeded"
} -start
diff --git a/reg-tests/checks/tcp-check_multiple_ports.vtc b/reg-tests/checks/tcp-check_multiple_ports.vtc
index daa3c5f..895c83f 100644
--- a/reg-tests/checks/tcp-check_multiple_ports.vtc
+++ b/reg-tests/checks/tcp-check_multiple_ports.vtc
@@ -7,15 +7,11 @@
syslog S1 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be1 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be1/srv1 failed.*Connection refused at step 2 of tcp-check.*connect port 1"
} -start
syslog S2 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be2 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be2/srv1 failed.*Connection refused at step 1 of tcp-check.*connect port 1"
} -start
diff --git a/reg-tests/checks/tcp-checks-socks4.vtc b/reg-tests/checks/tcp-checks-socks4.vtc
index bd0d3db..995298d 100644
--- a/reg-tests/checks/tcp-checks-socks4.vtc
+++ b/reg-tests/checks/tcp-checks-socks4.vtc
@@ -27,8 +27,6 @@
syslog S1 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy be1 started."
- recv
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be1/srv succeeded, reason: Layer7 check passed.+code: 200.+check duration: [[:digit:]]+ms, status: 1/1 UP."
} -start
diff --git a/reg-tests/checks/tls_health_checks.vtc b/reg-tests/checks/tls_health_checks.vtc
index ebc3c28..75d7114 100644
--- a/reg-tests/checks/tls_health_checks.vtc
+++ b/reg-tests/checks/tls_health_checks.vtc
@@ -28,8 +28,6 @@
} -start
syslog S1 -level notice {
- recv
- expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy fe1 started."
recv info
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: .* fe1~ be1/srv1 .* 200 [[:digit:]]+ - - ---- .* \"OPTIONS \\* HTTP/1.1\""
} -start
@@ -72,22 +70,16 @@
syslog S2 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h2_pid}\\]: Proxy be2 started."
- recv
expect ~ "[^:\\[ ]\\[${h2_pid}\\]: Health check for server be2/srv1 succeeded, reason: Layer7 check passed.+code: 200.+check duration: [[:digit:]]+ms, status: 1/1 UP."
} -start
syslog S4 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h2_pid}\\]: Proxy be4 started."
- recv
expect ~ "[^:\\[ ]\\[${h2_pid}\\]: Health check for server be4/srv2 succeeded, reason: Layer6 check passed.+check duration: [[:digit:]]+ms, status: 1/1 UP."
} -start
syslog S6 -level notice {
recv
- expect ~ "[^:\\[ ]\\[${h2_pid}\\]: Proxy be6 started."
- recv
expect ~ "[^:\\[ ]\\[${h2_pid}\\]: Health check for server be6/srv3 succeeded, reason: Layer7 check passed.+code: 200.+check duration: [[:digit:]]+ms, status: 1/1 UP."
} -start