This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-website.git
The following commit(s) were added to refs/heads/main by this push:
new 1bfea3198 Revert "[AMQ-8593] Document the new staticfailover discovery
agent"
new a144399ac Merge pull request #122 from
lucastetreault/revert-83-staticfailover
1bfea3198 is described below
commit 1bfea3198f8f04f0cd60cdb8a0a585baf4ccf183
Author: Lucas Tétreault <[email protected]>
AuthorDate: Tue Dec 12 08:47:39 2023 -0700
Revert "[AMQ-8593] Document the new staticfailover discovery agent"
---
src/networks-of-brokers.md | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/src/networks-of-brokers.md b/src/networks-of-brokers.md
index 0b7311820..80c649ab7 100644
--- a/src/networks-of-brokers.md
+++ b/src/networks-of-brokers.md
@@ -106,31 +106,16 @@ e.g.
uri="static:(tcp://host1:61616,tcp://host2:61616)?maxReconnectDelay=5000&useExponentialBackOff=false"
```
-StaticFailover Discovery
----------------------
-A common configuration option for a network of brokers is to establish a
network bridge between a broker and an n+1 broker pair. Typical configurations
involve using the `failover:` transport, but there are a some other
non-intuitive options that must be configured for it to work as desired. For
this reason, ActiveMQ v5.17.2+ has a convenience discovery agent that can be
specified with the `staticfailover:` transport prefix:
-```
-<networkConnectors>
- <networkConnector
uri="staticfailover:(tcp://host1:61616,tcp://host2:61616,tcp://..)"/>
-</networkConnectors>
-```
-The URIs are listed in order for: BROKER1,BROKER2,BROKER3...BROKER4
-
-The same configuration options for `static:` are available for
`staticfailover:`
-
MasterSlave Discovery
---------------------
-<div class="alert alert-warning">
- This discovery agent is deprecated as of 5.17.2 and will be removed in a
future release. Please use the staticfailover discovery agent.
-</div>
-A common configuration option for a network of brokers is to establish a
network bridge between a broker and an n+1 broker pair. Typical configurations
involve using the `failover:` transport, but there are a some other
non-intuitive options that must be configured for it to work as desired. For
this reason, ActiveMQ v5.6+ has a convenience discovery agent that can be
specified with the `masterslave:` transport prefix:
+A common configuration option for a network of brokers is to establish a
network bridge between a broker and an n+1 broker pair (master/slave). Typical
configurations involve using the `failover:` transport, but there are a some
other non-intuitive options that must be configured for it to work as desired.
For this reason, ActiveMQ v5.6+ has a convenience discovery agent that can be
specified with the `masterslave:` transport prefix:
```
<networkConnectors>
<networkConnector
uri="masterslave:(tcp://host1:61616,tcp://host2:61616,tcp://..)"/>
</networkConnectors>
```
-The URIs are listed in order for: BROKER1,BROKER2,BROKER3...BROKER4
+The URIs are listed in order for: MASTER,SLAVE1,SLAVE2...SLAVE
The same configuration options for `static:` are available for `masterslave:`
