ARTEMIS-530 acceptor CLI config
This commit is contained in:
jbertram
parent
76f6c9c3bd
commit
643fa22d05
|
|
@ -85,6 +85,10 @@ public class Create extends InputAbstract {
|
|||
public static final String ETC_CONNECTOR_SETTINGS_TXT = "etc/connector-settings.txt";
|
||||
public static final String ETC_BOOTSTRAP_WEB_SETTINGS_TXT = "etc/bootstrap-web-settings.txt";
|
||||
public static final String ETC_JOURNAL_BUFFER_SETTINGS = "etc/journal-buffer-settings.txt";
|
||||
public static final String ETC_AMQP_ACCEPTOR_TXT = "etc/amqp-acceptor.txt";
|
||||
public static final String ETC_HORNETQ_ACCEPTOR_TXT = "etc/hornetq-acceptor.txt";
|
||||
public static final String ETC_MQTT_ACCEPTOR_TXT = "etc/mqtt-acceptor.txt";
|
||||
public static final String ETC_STOMP_ACCEPTOR_TXT = "etc/stomp-acceptor.txt";
|
||||
|
||||
@Arguments(description = "The instance directory to hold the broker's configuration and data. Path must be writable.", required = true)
|
||||
File directory;
|
||||
|
|
@ -92,10 +96,13 @@ public class Create extends InputAbstract {
|
|||
@Option(name = "--host", description = "The host name of the broker (Default: 0.0.0.0 or input if clustered)")
|
||||
String host;
|
||||
|
||||
@Option(name = "--default-port", description = "The port number to use for the main 'artemis' acceptor (Default: 61616)")
|
||||
int defaultPort = DEFAULT_PORT;
|
||||
|
||||
@Option(name = "--name", description = "The name of the broker (Default: same as host)")
|
||||
String name;
|
||||
|
||||
@Option(name = "--port-offset", description = "Off sets the default ports")
|
||||
@Option(name = "--port-offset", description = "Off sets the ports of every acceptor")
|
||||
int portOffset;
|
||||
|
||||
@Option(name = "--force", description = "Overwrite configuration at destination directory")
|
||||
|
|
@ -176,6 +183,18 @@ public class Create extends InputAbstract {
|
|||
@Option(name = "--disable-persistence", description = "Disable message persistence to the journal")
|
||||
boolean disablePersistence;
|
||||
|
||||
@Option(name = "--no-amqp-acceptor", description = "Disable the AMQP specific acceptor.")
|
||||
boolean noAmqpAcceptor;
|
||||
|
||||
@Option(name = "--no-mqtt-acceptor", description = "Disable the MQTT specific acceptor.")
|
||||
boolean noMqttAcceptor;
|
||||
|
||||
@Option(name = "--no-stomp-acceptor", description = "Disable the STOMP specific acceptor.")
|
||||
boolean noStompAcceptor;
|
||||
|
||||
@Option(name = "--no-hornetq-acceptor", description = "Disable the HornetQ specific acceptor.")
|
||||
boolean noHornetQAcceptor;
|
||||
|
||||
boolean IS_WINDOWS;
|
||||
|
||||
boolean IS_CYGWIN;
|
||||
|
|
@ -500,7 +519,7 @@ public class Create extends InputAbstract {
|
|||
}
|
||||
|
||||
filters.put("${user}", System.getProperty("user.name", ""));
|
||||
filters.put("${default.port}", String.valueOf(DEFAULT_PORT + portOffset));
|
||||
filters.put("${default.port}", String.valueOf(defaultPort + portOffset));
|
||||
filters.put("${amqp.port}", String.valueOf(AMQP_PORT + portOffset));
|
||||
filters.put("${stomp.port}", String.valueOf(STOMP_PORT + portOffset));
|
||||
filters.put("${hq.port}", String.valueOf(HQ_PORT + portOffset));
|
||||
|
|
@ -602,6 +621,34 @@ public class Create extends InputAbstract {
|
|||
filters.put("${bootstrap-web-settings}", applyFilters(readTextFile(ETC_BOOTSTRAP_WEB_SETTINGS_TXT), filters));
|
||||
}
|
||||
|
||||
if (noAmqpAcceptor) {
|
||||
filters.put("${amqp-acceptor}", "");
|
||||
}
|
||||
else {
|
||||
filters.put("${amqp-acceptor}", applyFilters(readTextFile(ETC_AMQP_ACCEPTOR_TXT), filters));
|
||||
}
|
||||
|
||||
if (noMqttAcceptor) {
|
||||
filters.put("${mqtt-acceptor}", "");
|
||||
}
|
||||
else {
|
||||
filters.put("${mqtt-acceptor}", applyFilters(readTextFile(ETC_MQTT_ACCEPTOR_TXT), filters));
|
||||
}
|
||||
|
||||
if (noStompAcceptor) {
|
||||
filters.put("${stomp-acceptor}", "");
|
||||
}
|
||||
else {
|
||||
filters.put("${stomp-acceptor}", applyFilters(readTextFile(ETC_STOMP_ACCEPTOR_TXT), filters));
|
||||
}
|
||||
|
||||
if (noHornetQAcceptor) {
|
||||
filters.put("${hornetq-acceptor}", "");
|
||||
}
|
||||
else {
|
||||
filters.put("${hornetq-acceptor}", applyFilters(readTextFile(ETC_HORNETQ_ACCEPTOR_TXT), filters));
|
||||
}
|
||||
|
||||
performAutoTune(filters, aio, dataFolder);
|
||||
|
||||
write(ETC_BROKER_XML, filters, false);
|
||||
|
|
|
|||
|
|
@ -1,8 +1,3 @@
|
|||
|
||||
<!--
|
||||
This value was determined through a calculation.
|
||||
Your system could perform ${writesPerMillisecond} writes per millisecond
|
||||
on the current journal configuration.
|
||||
That translates as a sync write every ${nanoseconds} nanoseconds
|
||||
-->
|
||||
<journal-buffer-timeout>${nanoseconds}</journal-buffer-timeout>
|
||||
<!-- AMQP Acceptor. Listens on default AMQP port for AMQP traffic.-->
|
||||
<acceptor name="amqp">tcp://${host}:${amqp.port}?protocols=AMQP</acceptor>
|
||||
|
|
|
|||
|
|
@ -54,18 +54,7 @@ ${connector-config.settings}
|
|||
<!-- Default ActiveMQ Artemis Acceptor. Multi-protocol adapter. Currently supports ActiveMQ Artemis Core, OpenWire, STOMP, AMQP, MQTT, and HornetQ Core. -->
|
||||
<!-- performance tests have shown that openWire performs best with these buffer sizes -->
|
||||
<acceptor name="artemis">tcp://${host}:${default.port}?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576</acceptor>
|
||||
|
||||
<!-- AMQP Acceptor. Listens on default AMQP port for AMQP traffic.-->
|
||||
<acceptor name="amqp">tcp://${host}:${amqp.port}?protocols=AMQP</acceptor>
|
||||
|
||||
<!-- STOMP Acceptor. -->
|
||||
<acceptor name="stomp">tcp://${host}:${stomp.port}?protocols=STOMP</acceptor>
|
||||
|
||||
<!-- HornetQ Compatibility Acceptor. Enables HornetQ Core and STOMP for legacy HornetQ clients. -->
|
||||
<acceptor name="hornetq">tcp://${host}:${hq.port}?protocols=HORNETQ,STOMP</acceptor>
|
||||
|
||||
<!-- MQTT Acceptor -->
|
||||
<acceptor name="mqtt">tcp://${host}:${mqtt.port}?protocols=MQTT</acceptor>
|
||||
${amqp-acceptor}${stomp-acceptor}${hornetq-acceptor}${mqtt-acceptor}
|
||||
</acceptors>
|
||||
|
||||
${cluster-security.settings}${cluster.settings}${replicated.settings}${shared-store.settings}
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
|
||||
<!-- HornetQ Compatibility Acceptor. Enables HornetQ Core and STOMP for legacy HornetQ clients. -->
|
||||
<acceptor name="hornetq">tcp://${host}:${hq.port}?protocols=HORNETQ,STOMP</acceptor>
|
||||
<acceptor name="hornetq">tcp://${host}:${hq.port}?protocols=HORNETQ,STOMP</acceptor>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,3 @@
|
|||
|
||||
<!--
|
||||
This value was determined through a calculation.
|
||||
Your system could perform ${writesPerMillisecond} writes per millisecond
|
||||
on the current journal configuration.
|
||||
That translates as a sync write every ${nanoseconds} nanoseconds
|
||||
-->
|
||||
<journal-buffer-timeout>${nanoseconds}</journal-buffer-timeout>
|
||||
<!-- MQTT Acceptor -->
|
||||
<acceptor name="mqtt">tcp://${host}:${mqtt.port}?protocols=MQTT</acceptor>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,3 @@
|
|||
|
||||
<!--
|
||||
This value was determined through a calculation.
|
||||
Your system could perform ${writesPerMillisecond} writes per millisecond
|
||||
on the current journal configuration.
|
||||
That translates as a sync write every ${nanoseconds} nanoseconds
|
||||
-->
|
||||
<journal-buffer-timeout>${nanoseconds}</journal-buffer-timeout>
|
||||
<!-- STOMP Acceptor. -->
|
||||
<acceptor name="stomp">tcp://${host}:${stomp.port}?protocols=STOMP</acceptor>
|
||||
|
|
|
|||
|
|
@ -50,6 +50,10 @@ public class StreamClassPathTest {
|
|||
openStream(Create.ETC_CONNECTOR_SETTINGS_TXT);
|
||||
openStream(Create.ETC_BOOTSTRAP_WEB_SETTINGS_TXT);
|
||||
openStream(Create.ETC_JOURNAL_BUFFER_SETTINGS);
|
||||
openStream(Create.ETC_AMQP_ACCEPTOR_TXT);
|
||||
openStream(Create.ETC_MQTT_ACCEPTOR_TXT);
|
||||
openStream(Create.ETC_HORNETQ_ACCEPTOR_TXT);
|
||||
openStream(Create.ETC_STOMP_ACCEPTOR_TXT);
|
||||
}
|
||||
|
||||
private void openStream(String source) throws Exception {
|
||||
|
|
|
|||
Loading…
Reference in New Issue