Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing cluster-settings 

I have been playing with settings on the examples and the cluster settings are not really working by default
The default cluster-settings is using the wrong acceptor and the lack of max-hops is not making it work on most examples
maybe I will add some configuration on the max-hops through the create interface. I will set it as 0 for now at least
This commit is contained in:
Clebert Suconic 2015-05-20 20:19:07 -04:00
parent 5e17408c82
commit 304e71862f
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
View File

@ -103,6 +103,9 @@ public class Create extends InputAbstract
@Option(name = "--clustered", description = "Enable clustering") @Option(name = "--clustered", description = "Enable clustering")
boolean clustered = false; boolean clustered = false;
@Option(name = "--max-hops", description = "Number of hops on the cluster configuration")
int maxHops = 0;
@Option(name = "--replicated", description = "Enable broker replication") @Option(name = "--replicated", description = "Enable broker replication")
boolean replicated = false; boolean replicated = false;
@ -140,6 +143,16 @@ public class Create extends InputAbstract
boolean IS_CYGWIN; boolean IS_CYGWIN;
public int getMaxHops()
{
return maxHops;
}
public void setMaxHops(int maxHops)
{
this.maxHops = maxHops;
}
public boolean isNoWeb() public boolean isNoWeb()
{ {
return noWeb; return noWeb;
@ -434,7 +447,7 @@ public class Create extends InputAbstract
filters.put("${hq.port}", String.valueOf(HQ_PORT + portOffset)); filters.put("${hq.port}", String.valueOf(HQ_PORT + portOffset));
filters.put("${http.port}", String.valueOf(HTTP_PORT + portOffset)); filters.put("${http.port}", String.valueOf(HTTP_PORT + portOffset));
filters.put("${data.dir}", data); filters.put("${data.dir}", data);
filters.put("${max-hops}", String.valueOf(maxHops));
filters.put("${user}", getUser()); filters.put("${user}", getUser());
filters.put("${password}", getPassword()); filters.put("${password}", getPassword());
filters.put("${role}", getRole()); filters.put("${role}", getRole());
@ -448,7 +461,7 @@ public class Create extends InputAbstract
filters.put("${connector-config.settings}", connectorSettings); filters.put("${connector-config.settings}", connectorSettings);
filters.put("${cluster-security.settings}", readTextFile(ETC_CLUSTER_SECURITY_SETTINGS_TXT)); filters.put("${cluster-security.settings}", readTextFile(ETC_CLUSTER_SECURITY_SETTINGS_TXT));
filters.put("${cluster.settings}", readTextFile(ETC_CLUSTER_SETTINGS_TXT)); filters.put("${cluster.settings}", applyFilters(readTextFile(ETC_CLUSTER_SETTINGS_TXT), filters));
filters.put("${cluster-user}", getClusterUser()); filters.put("${cluster-user}", getClusterUser());
filters.put("${cluster-password}", getClusterPassword()); filters.put("${cluster-password}", getClusterPassword());
} }

4
artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt
View File

@ -19,7 +19,9 @@
<cluster-connections> <cluster-connections>
<cluster-connection name="my-cluster"> <cluster-connection name="my-cluster">
<address>jms</address> <address>jms</address>
<connector-ref>activemq</connector-ref> <connector-ref>artemis</connector-ref>
<max-hops>${max-hops}</max-hops>
<discovery-group-ref discovery-group-name="dg-group1"/> <discovery-group-ref discovery-group-name="dg-group1"/>
</cluster-connection> </cluster-connection>
</cluster-connections> </cluster-connections>