From 725f8d29ff9c1a6a3c0d4a9e3200aed8ca15c908 Mon Sep 17 00:00:00 2001 From: Amaury Denoyelle Date: Mon, 20 Sep 2021 15:16:12 +0200 Subject: [PATCH] MINOR: server: enable more check related keywords for dynamic servers Allow to use the check related keywords defined in server.c. These keywords can be enabled now that checks have been implemented for dynamic servers. Here is the list of the new keywords supported : - error-limit - observe - on-error - on-marked-down - on-marked-up --- doc/management.txt | 5 +++++ src/server.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/doc/management.txt b/doc/management.txt index 254f604e7..64172e5a9 100644 --- a/doc/management.txt +++ b/doc/management.txt @@ -1520,6 +1520,7 @@ add server / [args]* - disabled - downinter - enabled + - error-limit - fall - fastinter - force-sslv3/tlsv10/tlsv11/tlsv12/tlsv13 @@ -1532,6 +1533,10 @@ add server / [args]* - no-sslv3/tlsv10/tlsv11/tlsv12/tlsv13 - no-tls-tickets - npn + - observe + - on-error + - on-marked-down + - on-marked-up - pool-low-conn - pool-max-conn - pool-purge-delay diff --git a/src/server.c b/src/server.c index 96c71fb51..8558540d4 100644 --- a/src/server.c +++ b/src/server.c @@ -1643,7 +1643,7 @@ static struct srv_kw_list srv_kws = { "ALL", { }, { { "cookie", srv_parse_cookie, 1, 1, 0 }, /* Assign a cookie to the server */ { "disabled", srv_parse_disabled, 0, 1, 1 }, /* Start the server in 'disabled' state */ { "enabled", srv_parse_enabled, 0, 1, 1 }, /* Start the server in 'enabled' state */ - { "error-limit", srv_parse_error_limit, 1, 1, 0 }, /* Configure the consecutive count of check failures to consider a server on error */ + { "error-limit", srv_parse_error_limit, 1, 1, 1 }, /* Configure the consecutive count of check failures to consider a server on error */ { "id", srv_parse_id, 1, 0, 1 }, /* set id# of server */ { "init-addr", srv_parse_init_addr, 1, 1, 0 }, /* */ { "log-proto", srv_parse_log_proto, 1, 1, 0 }, /* Set the protocol for event messages, only relevant in a ring section */ @@ -1657,10 +1657,10 @@ static struct srv_kw_list srv_kws = { "ALL", { }, { { "no-send-proxy-v2", srv_parse_no_send_proxy_v2, 0, 1, 1 }, /* Disable use of PROXY V2 protocol */ { "no-tfo", srv_parse_no_tfo, 0, 1, 1 }, /* Disable use of TCP Fast Open */ { "non-stick", srv_parse_non_stick, 0, 1, 0 }, /* Disable stick-table persistence */ - { "observe", srv_parse_observe, 1, 1, 0 }, /* Enables health adjusting based on observing communication with the server */ - { "on-error", srv_parse_on_error, 1, 1, 0 }, /* Configure the action on check failure */ - { "on-marked-down", srv_parse_on_marked_down, 1, 1, 0 }, /* Configure the action when a server is marked down */ - { "on-marked-up", srv_parse_on_marked_up, 1, 1, 0 }, /* Configure the action when a server is marked up */ + { "observe", srv_parse_observe, 1, 1, 1 }, /* Enables health adjusting based on observing communication with the server */ + { "on-error", srv_parse_on_error, 1, 1, 1 }, /* Configure the action on check failure */ + { "on-marked-down", srv_parse_on_marked_down, 1, 1, 1 }, /* Configure the action when a server is marked down */ + { "on-marked-up", srv_parse_on_marked_up, 1, 1, 1 }, /* Configure the action when a server is marked up */ { "pool-low-conn", srv_parse_pool_low_conn, 1, 1, 1 }, /* Set the min number of orphan idle connecbefore being allowed to pick from other threads */ { "pool-max-conn", srv_parse_pool_max_conn, 1, 1, 1 }, /* Set the max number of orphan idle connections, -1 means unlimited */ { "pool-purge-delay", srv_parse_pool_purge_delay, 1, 1, 1 }, /* Set the time before we destroy orphan idle connections, defaults to 1s */