This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 18e2daf Clarify settings for static clusters
18e2daf is described below
commit 18e2dafe89b4bccd8b68a39190f3600d78a8634a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Feb 1 10:20:46 2022 +0000
Clarify settings for static clusters
---
webapps/docs/changelog.xml | 4 ++++
webapps/docs/config/cluster-listener.xml | 7 +------
webapps/docs/config/cluster-membership.xml | 5 +++++
webapps/docs/config/cluster-valve.xml | 4 +++-
webapps/docs/config/cluster.xml | 4 ++++
5 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1860389..b0c36ec 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -134,6 +134,10 @@
Better documentation for the <code>protocol</code> attribute of the
<code>JNDIRealm</code>. (markt)
</fix>
+ <fix>
+ Clarify the settings described in the documentation web application to
+ configure a cluster using static membership. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="jdbc-pool">
diff --git a/webapps/docs/config/cluster-listener.xml
b/webapps/docs/config/cluster-listener.xml
index d710334..f27f1b3 100644
--- a/webapps/docs/config/cluster-listener.xml
+++ b/webapps/docs/config/cluster-listener.xml
@@ -49,21 +49,16 @@
<section name="Attributes">
- <subsection name="Common Attributes">
-
<attributes>
<attribute name="className" required="true">
-
+ Set value to
<code>org.apache.catalina.ha.session.ClusterSessionListener</code>
</attribute>
</attributes>
- </subsection>
-
-
</section>
diff --git a/webapps/docs/config/cluster-membership.xml
b/webapps/docs/config/cluster-membership.xml
index 80e4be3..a8cb0b6 100644
--- a/webapps/docs/config/cluster-membership.xml
+++ b/webapps/docs/config/cluster-membership.xml
@@ -179,6 +179,11 @@
</subsection>
<subsection name="Static Membership Attributes">
+
+ <p>When using the static membership service you must ensure that the
+ <code>channelStartOptions</code> attribute of the <code>Cluster</code>
+ element is set to the default value of <code>15</code>.</p>
+
<attributes>
<attribute name="className" required="true">
<p>
diff --git a/webapps/docs/config/cluster-valve.xml
b/webapps/docs/config/cluster-valve.xml
index 7722bd7..9c375ce 100644
--- a/webapps/docs/config/cluster-valve.xml
+++ b/webapps/docs/config/cluster-valve.xml
@@ -61,7 +61,9 @@
been no session change. An example filter would look like <code>
filter=".*\.gif|.*\.js|.*\.jpeg|.*\.jpg|.*\.png|.*\.htm|.*\.html|.*\.css|.*\.txt"
</code>. The filter is a regular expression using
- <code>java.util.regex</code>.
+ <code>java.util.regex</code>. If no filter pattern specified or if the
+ filter pattern is configured to be the empty string, no filtering will
+ take place.
</attribute>
<attribute name="primaryIndicator" required="false">
Boolean value, so to true, and the replication valve will insert a
request attribute with the name
diff --git a/webapps/docs/config/cluster.xml b/webapps/docs/config/cluster.xml
index 12434a8..0535b4a 100644
--- a/webapps/docs/config/cluster.xml
+++ b/webapps/docs/config/cluster.xml
@@ -196,6 +196,10 @@ Tomcat cluster. These include:</p>
Channel.SND_TX_SEQ (2) |
Channel.MBR_RX_SEQ (4) |
Channel.MBR_TX_SEQ (8);</source>
+ <p>When using the static membership service
+
<code>org.apache.catalina.tribes.membership.StaticMembershipService</code>
+ you must ensure that this attribute is configured to use the default
+ value.</p>
</attribute>
<attribute name="heartbeatBackgroundEnabled" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
