From 98d9944670be19aba9918c2fe75503ec4051ecf8 Mon Sep 17 00:00:00 2001
From: Christophe Jaillet
Date: Sat, 26 May 2018 08:21:19 +0000
Subject: [PATCH] backport r1817908 which fixes some example (see PR 61650) +
make some cosmetic changes (r1832294 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832295 13f79535-47bb-0310-9956-ffa450edef68
---
docs/manual/mod/mod_proxy.xml | 2 +-
docs/manual/mod/mod_proxy_hcheck.xml | 47 ++++++++++++++++++----------
2 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 834274b04b..b16a2cc83e 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -1178,7 +1178,7 @@ ProxyPass "/mirror/foo/i" "!"
Route of the worker when used inside load balancer.
The route is a value appended to session id.
|
- status |
+
status |
- |
Single letter value defining the initial status of
this worker.
diff --git a/docs/manual/mod/mod_proxy_hcheck.xml b/docs/manual/mod/mod_proxy_hcheck.xml
index 72a26d5484..6ab8d35d4f 100644
--- a/docs/manual/mod/mod_proxy_hcheck.xml
+++ b/docs/manual/mod/mod_proxy_hcheck.xml
@@ -40,10 +40,11 @@
Parameters
The health check mechanism is enabled via the use of additional
- BalancerMember parameters, which are configured in the standard
- way via ProxyPass:
+ BalancerMember parameters, which are configured
+ in the standard way via ProxyPass:
- A new BalancerMember status state (flag) is defined via this module: "C ".
+ A new BalancerMember status state (flag)
+ is defined via this module: "C ".
When the worker is taken offline due to failures as determined by the health
check module, this flag is set, and can be seen (and modified) via the
balancer-manager .
@@ -84,10 +85,12 @@
Additional URI to be appended to the worker URL for the health check. | |
hctemplate |
|
- Name of template, created via ProxyHCTemplate to use for setting health check parameters for this worker |
+ Name of template, created via ProxyHCTemplate,
+ to use for setting health check parameters for this worker |
hcexpr |
|
- Name of expression, created via ProxyHCExpr, used to check response headers for health.
+ | Name of expression, created via ProxyHCExpr,
+ used to check response headers for health.
If not used, 2xx thru 3xx status codes imply success |
@@ -109,7 +112,7 @@ ProxyHCExpr in_maint {hc('body') !~ /Under maintenance/}
<Proxy balancer://foo>
BalancerMember http://www.example.com/ hcmethod=GET hcexpr=in_maint hcuri=/status.php
- BalancerMember http://www2.example.com/ hcmethod=HEAD hcexpr=ok234 hcinterval=10
+ BalancerMember http://www2.example.com/ hcmethod=HEAD hcexpr=ok234 hcinterval=10
BalancerMember http://www3.example.com/ hcmethod=TCP hcinterval=5 hcpasses=2 hcfails=3
BalancerMember http://www4.example.com/
</Proxy>
@@ -135,8 +138,8 @@ not dynamically checked at all.
ProxyHCExpr
-Creates a named condition expression to use to determine health of the backend based on its response.
-ProxyHCExpr name {ap_expr expression}
+Creates a named condition expression to use to determine health of the backend based on its response
+ProxyHCExpr name {ap_expr expression}
server configvirtual host
@@ -145,12 +148,16 @@ not dynamically checked at all.
for creating a named condition expression that checks the response
headers of the backend server to determine its health. This named
condition can then be assigned to balancer members via the hcexpr
- parameter
+ parameter.
ProxyHCExpr: Allow for 2xx/3xx/4xx as passing
ProxyHCExpr ok234 {%{REQUEST_STATUS} =~ /^[234]/}
-ProxyPass "/apps" "http://backend.example.com/" hcexpr=ok234
+ProxyPass "/apps" "balancer://foo"
+
+<Proxy balancer://foo>
+ BalancerMember http://www2.example.com/ hcmethod=HEAD hcexpr=ok234 hcinterval=10
+</Proxy>
@@ -170,7 +177,11 @@ ProxyPass "/apps" "http://backend.example.com/" hcexpr=ok234
ProxyHCExpr: Checking response body
ProxyHCExpr in_maint {hc('body') !~ /Under maintenance/}
-ProxyPass "/apps" "http://backend.example.com/" hcexpr=in_maint hcmethod=get hcuri=/status.php
+ProxyPass "/apps" "balancer://foo"
+
+<Proxy balancer://foo>
+ BalancerMember http://www.example.com/ hcexpr=in_maint hcmethod=get hcuri=/status.php
+</Proxy>
@@ -182,7 +193,7 @@ ProxyPass "/apps" "http://backend.example.com/" hcexpr=in_maint hcmethod=get
ProxyHCTemplate
Creates a named template for setting various health check parameters
-ProxyHCTemplate name parameter=setting <...>
+ProxyHCTemplate name parameter=setting [...]
server configvirtual host
@@ -190,12 +201,16 @@ ProxyPass "/apps" "http://backend.example.com/" hcexpr=in_maint hcmethod=get
The ProxyHCTemplate directive allows
for creating a named set (template) of health check parameters
that can then be assigned to balancer members via the hctemplate
- parameter
+ parameter.
ProxyHCTemplate
ProxyHCTemplate tcp5 hcmethod=tcp hcinterval=5
-ProxyPass "/apps" "http://backend.example.com/" hctemplate=tcp5
+ProxyPass "/apps" "balancer://foo"
+
+<Proxy balancer://foo>
+ BalancerMember http://www2.example.com/ hctemplate=tcp5
+</Proxy>
@@ -204,8 +219,8 @@ ProxyPass "/apps" "http://backend.example.com/" hctemplate=tcp5
ProxyHCTPsize
-Sets the total server-wide size of the threadpool used for the health check workers.
-ProxyHCTPsize <size>
+Sets the total server-wide size of the threadpool used for the health check workers
+ProxyHCTPsize size
server config
--
2.40.0