diff options
author | Willy Tarreau <w@1wt.eu> | 2020-09-24 09:57:32 +0200 |
---|---|---|
committer | Willy Tarreau <w@1wt.eu> | 2020-10-07 18:45:03 +0200 |
commit | 3a7e6a28d47ee60477b46f304f166468afc34fe6 (patch) | |
tree | 209fd19620a6311dafbcc19f6a5e83a4a8e1fce8 | |
parent | c00e580cb8d8257a401e31442d3758cd72d77d9e (diff) | |
download | haproxy-3a7e6a28d47ee60477b46f304f166468afc34fe6.tar.gz |
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.
26 files changed, 4 insertions, 197 deletions
diff --git a/include/haproxy/proxy.h b/include/haproxy/proxy.h index b89dac2e7..b714bda81 100644 --- a/include/haproxy/proxy.h +++ b/include/haproxy/proxy.h @@ -39,7 +39,6 @@ extern struct eb_root proxy_by_name; /* tree of proxies sorted by name */ extern const struct cfg_opt cfg_opts[]; extern const struct cfg_opt cfg_opts2[]; -void start_proxies(void); struct task *manage_proxy(struct task *t, void *context, unsigned short state); void soft_stop(void); int pause_proxy(struct proxy *p); diff --git a/reg-tests/checks/1be_40srv_odd_health_checks.vtc b/reg-tests/checks/1be_40srv_odd_health_checks.vtc index a2a659b65..44edfe5b5 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 @@ feature ignore_unknown_macro #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 eaa835586..9cc6279c9 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 @@ feature ignore_unknown_macro # (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 ec72d9089..98827aaeb 100644 --- a/reg-tests/checks/4be_1srv_health_checks.vtc +++ b/reg-tests/checks/4be_1srv_health_checks.vtc @@ -37,8 +37,6 @@ server s4 { 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 S1 -level notice { 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 S2 -level notice { 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 S3 -level notice { 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 a226f4637..f9f37a187 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 @@ barrier b cond 3 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 S1 -level notice { 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 S2 -level notice { 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 ab629db8e..12f86d907 100644 --- a/reg-tests/checks/http-check-expect.vtc +++ b/reg-tests/checks/http-check-expect.vtc @@ -21,8 +21,6 @@ server s1 { 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 05f09a84c..179e149ed 100644 --- a/reg-tests/checks/http-check-send.vtc +++ b/reg-tests/checks/http-check-send.vtc @@ -66,36 +66,26 @@ server s5 { 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 27ad474ea..1180c3de6 100644 --- a/reg-tests/checks/http-check.vtc +++ b/reg-tests/checks/http-check.vtc @@ -75,15 +75,6 @@ server s4 { 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 51fa7207e..4c0db11a6 100644 --- a/reg-tests/checks/ldap-check.vtc +++ b/reg-tests/checks/ldap-check.vtc @@ -25,22 +25,16 @@ server s3 { 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 5344d95fc..2d20714d5 100644 --- a/reg-tests/checks/mysql-check.vtc +++ b/reg-tests/checks/mysql-check.vtc @@ -39,36 +39,26 @@ server s5 { 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 4620d6fd7..968a18cd7 100644 --- a/reg-tests/checks/pgsql-check.vtc +++ b/reg-tests/checks/pgsql-check.vtc @@ -25,22 +25,16 @@ server s3 { 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 a9c85cb18..c6d4fe4b1 100644 --- a/reg-tests/checks/redis-check.vtc +++ b/reg-tests/checks/redis-check.vtc @@ -20,15 +20,11 @@ server s2 { 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 ab24b0c86..29d0ddbb8 100644 --- a/reg-tests/checks/smtp-check.vtc +++ b/reg-tests/checks/smtp-check.vtc @@ -36,36 +36,26 @@ server s5 { 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 8446c77b5..c6b704b12 100644 --- a/reg-tests/checks/spop-check.vtc +++ b/reg-tests/checks/spop-check.vtc @@ -30,29 +30,21 @@ server s4 { 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 c4b0b534e..7f8d9b90e 100644 --- a/reg-tests/checks/ssl-hello-check.vtc +++ b/reg-tests/checks/ssl-hello-check.vtc @@ -9,23 +9,17 @@ feature ignore_unknown_macro 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 149bf7a03..02dc6f010 100644 --- a/reg-tests/checks/tcp-check-ssl.vtc +++ b/reg-tests/checks/tcp-check-ssl.vtc @@ -6,17 +6,6 @@ feature ignore_unknown_macro 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 S_ok -level notice { 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 61ff3c867..370c9468d 100644 --- a/reg-tests/checks/tcp-check_min-recv.vtc +++ b/reg-tests/checks/tcp-check_min-recv.vtc @@ -8,15 +8,11 @@ feature ignore_unknown_macro 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 daa3c5f69..895c83f79 100644 --- a/reg-tests/checks/tcp-check_multiple_ports.vtc +++ b/reg-tests/checks/tcp-check_multiple_ports.vtc @@ -7,15 +7,11 @@ feature ignore_unknown_macro 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/tls_health_checks.vtc b/reg-tests/checks/tls_health_checks.vtc index ebc3c280a..75d7114e5 100644 --- a/reg-tests/checks/tls_health_checks.vtc +++ b/reg-tests/checks/tls_health_checks.vtc @@ -28,8 +28,6 @@ server s3 { } -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 @@ haproxy h1 -conf { 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 diff --git a/reg-tests/http-cookies/cookie_insert_indirect.vtc b/reg-tests/http-cookies/cookie_insert_indirect.vtc index f599a0f12..f1afe9ecb 100644 --- a/reg-tests/http-cookies/cookie_insert_indirect.vtc +++ b/reg-tests/http-cookies/cookie_insert_indirect.vtc @@ -11,10 +11,6 @@ feature ignore_unknown_macro # (invalid, insert) flags. syslog S1 -level notice { - recv - expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy (fe|be)1 started." - recv - expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy (fe|be)1 started." recv info expect ~ "[^:\\[ ]\\[${h1_pid}\\]: .* fe1 be1/srv1 .* --II .* \"GET / HTTP/1\\.1\"" } -start diff --git a/reg-tests/http-rules/map_regm_with_backref.vtc b/reg-tests/http-rules/map_regm_with_backref.vtc index 790a10b0d..0e6e66e4c 100644 --- a/reg-tests/http-rules/map_regm_with_backref.vtc +++ b/reg-tests/http-rules/map_regm_with_backref.vtc @@ -14,10 +14,6 @@ feature ignore_unknown_macro #REGTEST_TYPE=bug syslog S1 -level notice { - recv - expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy (fe|be)1 started." - recv - expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Proxy (fe|be)1 started." recv info # not expecting ${h1_pid} with master-worker expect ~ "[^:\\[ ]\\[[[:digit:]]+\\]: .* fe1 be1/s1 [[:digit:]]+/[[:digit:]]+/[[:digit:]]+/[[:digit:]]+/[[:digit:]]+ 200 [[:digit:]]+ - - ---- .* \"GET / HTTP/(1|2)(\\.1)?\"" diff --git a/reg-tests/log/load_balancing.vtc b/reg-tests/log/load_balancing.vtc index 765ce6151..a89787781 100644 --- a/reg-tests/log/load_balancing.vtc +++ b/reg-tests/log/load_balancing.vtc @@ -30,9 +30,9 @@ syslog Slg_1 -level info { # Here are the syslog messages received by Slg_2: syslog Slg_2 -level info { recv - expect ~ "[^:\\[ ]\\[${h1_pid}\\]: .* \"GET /client_c7 HTTP/1.1\"" + expect ~ "[^:\\[ ]\\[${h1_pid}\\]: .* \"GET /client_c6 HTTP/1.1\"" recv - expect ~ "[^:\\[ ]\\[${h1_pid}\\]: .* \"GET /client_c10 HTTP/1.1\"" + expect ~ "[^:\\[ ]\\[${h1_pid}\\]: .* \"GET /client_c8 HTTP/1.1\"" } -repeat 50 -start haproxy h1 -conf { diff --git a/reg-tests/log/wrong_ip_port_logging.vtc b/reg-tests/log/wrong_ip_port_logging.vtc index 52857a2e3..afb71e060 100644 --- a/reg-tests/log/wrong_ip_port_logging.vtc +++ b/reg-tests/log/wrong_ip_port_logging.vtc @@ -29,8 +29,6 @@ server s1 { } -start syslog Slg_1 -level notice { - recv - recv recv info expect ~ \"dip\":\"${h1_fe_1_addr}\",\"dport\":\"${h1_fe_1_port}.*\"ts\":\"[cC]D\",\" } -start diff --git a/reg-tests/lua/bad_http_clt_req_duration.vtc b/reg-tests/lua/bad_http_clt_req_duration.vtc index ae46ea114..2da5e873f 100644 --- a/reg-tests/lua/bad_http_clt_req_duration.vtc +++ b/reg-tests/lua/bad_http_clt_req_duration.vtc @@ -26,12 +26,6 @@ varnishtest "LUA bug" feature ignore_unknown_macro syslog Slog { - recv notice - expect ~ "[^:\\[ ]*\\[[0-9]*\\]: Proxy f1 started" - - recv notice - expect ~ "[^:\\[ ]\\[[0-9]*\\]: Proxy f2 started" - recv info expect ~ "[^:\\[ ]\\[[0-9]*\\]: Ta=[0-9]* Tc=[0-9]* Td=[0-9]* Th=[0-9]* Ti=[0-9]* Tq=[0-9]* TR=[0-9]* Tr=[0-9]* Tt=[0-9]* Tw=[0-9]*$" diff --git a/src/haproxy.c b/src/haproxy.c index 23cfa246e..bd05430fa 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -3180,8 +3180,6 @@ int main(int argc, char **argv) exit(1); } - start_proxies(); - if (!(global.mode & MODE_MWORKER_WAIT) && listeners == 0) { ha_alert("[%s.main()] No enabled listener found (check for 'bind' directives) ! Exiting.\n", argv[0]); /* Note: we don't have to send anything to the old pids because we diff --git a/src/proxy.c b/src/proxy.c index 7bcfa9578..217ca6fd3 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -1046,20 +1046,6 @@ void init_new_proxy(struct proxy *p) } /* - * This function finishes the startup of proxies by marking them ready. */ -void start_proxies(void) -{ - struct proxy *curproxy; - - for (curproxy = proxies_list; curproxy != NULL; curproxy = curproxy->next) { - if (curproxy->disabled) - continue; - send_log(curproxy, LOG_NOTICE, "Proxy %s started.\n", curproxy->id); - } -} - - -/* * This is the proxy management task. It enables proxies when there are enough * free streams, or stops them when the table is full. It is designed to be * called as a task which is woken up upon stopping or when rate limiting must |