Skip to content

JAMES-4200 ActiveMQ: add a configuration option for adjusting usage l… #2999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Arsnael wants to merge 3 commits into
base: master
Choose a base branch
from
Open

JAMES-4200 ActiveMQ: add a configuration option for adjusting usage l… #2999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0764dd7
JAMES-4200 ActiveMQ: add a configuration option for adjusting usage l…
Arsnael Apr 10, 2026
bc4fa21
fixup! JAMES-4200 ActiveMQ: add a configuration option for adjusting …
Arsnael Apr 10, 2026
5d22716
fixup! JAMES-4200 ActiveMQ: add a configuration option for adjusting …
Arsnael Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions ...e/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,32 @@
import org.apache.james.queue.activemq.metric.ActiveMQMetricConfiguration;

public class ActiveMQConfiguration {
private static final String ADJUST_USAGE_LIMITS = "adjust.usage.limits";
private static final boolean ADJUST_USAGE_LIMITS_DEFAULT = true;

private final ActiveMQMetricConfiguration metricConfiguration;
private final boolean adjustUsageLimits;

public static ActiveMQConfiguration getDefault() {
return from(new BaseConfiguration());
}

public static ActiveMQConfiguration from(Configuration configuration) {
return new ActiveMQConfiguration(ActiveMQMetricConfiguration.from(configuration));
return new ActiveMQConfiguration(
ActiveMQMetricConfiguration.from(configuration),
configuration.getBoolean(ADJUST_USAGE_LIMITS, ADJUST_USAGE_LIMITS_DEFAULT));
}

private ActiveMQConfiguration(ActiveMQMetricConfiguration metricConfiguration) {
private ActiveMQConfiguration(ActiveMQMetricConfiguration metricConfiguration, boolean adjustUsageLimits) {
this.metricConfiguration = metricConfiguration;
this.adjustUsageLimits = adjustUsageLimits;
}

public ActiveMQMetricConfiguration getMetricConfiguration() {
return metricConfiguration;
}

public boolean isAdjustUsageLimits() {
return adjustUsageLimits;
}
}
8 changes: 4 additions & 4 deletions .../queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/EmbeddedActiveMQ.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ public class EmbeddedActiveMQ {
private BrokerService brokerService;

@Inject
private EmbeddedActiveMQ(FileSystem fileSystem, PersistenceAdapter persistenceAdapter) {
private EmbeddedActiveMQ(FileSystem fileSystem, PersistenceAdapter persistenceAdapter, ActiveMQConfiguration configuration) {
this.persistenceAdapter = persistenceAdapter;
try {
persistenceAdapter.setDirectory(fileSystem.getFile(KAHADB_STORE_LOCATION));
launchEmbeddedBroker(fileSystem);
launchEmbeddedBroker(fileSystem, configuration);
} catch (Exception e) {
throw new RuntimeException(e);
}
Expand Down Expand Up @@ -94,15 +94,15 @@ private BlobTransferPolicy createBlobTransferPolicy(FileSystem fileSystem) {
return blobTransferPolicy;
}

private void launchEmbeddedBroker(FileSystem fileSystem) throws Exception {
private void launchEmbeddedBroker(FileSystem fileSystem, ActiveMQConfiguration configuration) throws Exception {
brokerService = new BrokerService();
brokerService.setBrokerName(BROKER_NAME);
brokerService.setUseJmx(false);
brokerService.setPersistent(true);
brokerService.setDataDirectoryFile(fileSystem.getFile(BROCKERS_LOCATION));
brokerService.setUseShutdownHook(false);
brokerService.setSchedulerSupport(false);
brokerService.setAdjustUsageLimits(false);
brokerService.setAdjustUsageLimits(configuration.isAdjustUsageLimits());
brokerService.setBrokerId(BROKER_ID);
String[] uris = {BROCKER_URI};
brokerService.setTransportConnectorURIs(uris);
Expand Down
3 changes: 3 additions & 0 deletions server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,12 @@
<bean id="embeddedActiveMQ" class="org.apache.james.queue.activemq.EmbeddedActiveMQ">
<constructor-arg index="0" ref="filesystem"/>
<constructor-arg index="1" ref="persistenceAdapter"/>
<constructor-arg index="2" ref="configuration"/>
</bean>

<bean id="persistenceAdapter" class="org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter"/>

<bean id="activeMQMetricCollector" class="org.apache.james.queue.activemq.metric.ActiveMQMetricCollectorNoop"/>

<bean id="configuration" class="org.apache.james.queue.activemq.ActiveMQConfiguration" factory-method="getDefault"/>
</beans>
10 changes: 10 additions & 0 deletions src/site/xdoc/server/config-activemq.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,16 @@

</section>

<section name="ActiveMQ Configuration">
<p>
ActiveMQ offers some configuration options:
</p>
<dl>
<dt><strong>adjust.usage.limits</strong></dt>
<dd>Enable adjusting usage limits (defaults to true). You might want to turn it to false
for limiting memory usage for example.</dd>
</dl>
</section>

<section name="ActiveMQ Metrics Configuration">
<p>
Expand Down