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

monitor connection splits is now on by default 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636930 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2008-03-14 00:04:32 +00:00
parent ba3e913daf
commit 5dc188eb32
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
View File

@ -164,7 +164,7 @@ public class BrokerService implements Service {
private int producerSystemUsagePortion = 60; private int producerSystemUsagePortion = 60;
private int consumerSystemUsagePortion = 40; private int consumerSystemUsagePortion = 40;
private boolean splitSystemUsageForProducersConsumers; private boolean splitSystemUsageForProducersConsumers;
private boolean monitorConnectionSplits; private boolean monitorConnectionSplits=true;
private int taskRunnerPriority = Thread.NORM_PRIORITY; private int taskRunnerPriority = Thread.NORM_PRIORITY;
private boolean dedicatedTaskRunner; private boolean dedicatedTaskRunner;
private boolean cacheTempDestinations=true;//useful for failover private boolean cacheTempDestinations=true;//useful for failover

32
activemq-core/src/main/java/org/apache/activemq/broker/cluster/ConnectionSplitBroker.java
View File

@ -49,25 +49,27 @@ public class ConnectionSplitBroker extends BrokerFilter{
if (info.isNetworkSubscription()) { if (info.isNetworkSubscription()) {
networkConsumerList.add(info); networkConsumerList.add(info);
} else { } else {
List<ConsumerInfo> gcList = new ArrayList<ConsumerInfo>(); if(!networkConsumerList.isEmpty()) {
for (ConsumerInfo nc : networkConsumerList) { List<ConsumerInfo> gcList = new ArrayList<ConsumerInfo>();
if (!nc.isNetworkConsumersEmpty()) { for (ConsumerInfo nc : networkConsumerList) {
for (ConsumerId id : nc.getNetworkConsumerIds()) { if (!nc.isNetworkConsumersEmpty()) {
if (id.equals(info.getConsumerId())) { for (ConsumerId id : nc.getNetworkConsumerIds()) {
nc.removeNetworkConsumerId(id); if (id.equals(info.getConsumerId())) {
if (nc.isNetworkConsumersEmpty()) { nc.removeNetworkConsumerId(id);
gcList.add(nc); if (nc.isNetworkConsumersEmpty()) {
gcList.add(nc);
}
} }
} }
} else {
gcList.add(nc);
} }
} else {
gcList.add(nc);
} }
} for (ConsumerInfo nc : gcList) {
for (ConsumerInfo nc : gcList) { networkConsumerList.remove(nc);
networkConsumerList.remove(nc); super.removeConsumer(context, nc);
super.removeConsumer(context, nc); LOG.warn("Removed stale network consumer " + nc);
LOG.warn("Removed stale network consumer" + nc); }
} }
} }
} }