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

Applied http://issues.apache.org/activemq/browse/AMQ-608 thanks Kevin. 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/branches/activemq-4.0@414444 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2006-06-15 03:07:12 +00:00
parent 396c25dc16
commit 1e47d1ba03
5 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
View File

@ -357,20 +357,20 @@ public abstract class DemandForwardingBridgeSupport implements Bridge {
ConsumerInfo info=(ConsumerInfo) data; ConsumerInfo info=(ConsumerInfo) data;
BrokerId[] path=info.getBrokerPath(); BrokerId[] path=info.getBrokerPath();
if((path!=null&&path.length>= networkTTL)){ if((path!=null&&path.length>= networkTTL)){
if(log.isTraceEnabled()) if(log.isDebugEnabled())
log.trace("Ignoring Subscription " + info + " restricted to " + networkTTL + " network hops only"); log.debug("Ignoring Subscription " + info + " restricted to " + networkTTL + " network hops only");
return; return;
} }
if(contains(info.getBrokerPath(),localBrokerPath[0])){ if(contains(info.getBrokerPath(),localBrokerPath[0])){
// Ignore this consumer as it's a consumer we locally sent to the broker. // Ignore this consumer as it's a consumer we locally sent to the broker.
if(log.isTraceEnabled()) if(log.isDebugEnabled())
log.trace("Ignoring sub " + info + " already routed through this broker once"); log.debug("Ignoring sub " + info + " already routed through this broker once");
return; return;
} }
if (!isPermissableDestination(info.getDestination())){ if (!isPermissableDestination(info.getDestination())){
//ignore if not in the permited or in the excluded list //ignore if not in the permited or in the excluded list
if(log.isTraceEnabled()) if(log.isDebugEnabled())
log.trace("Ignoring sub " + info + " destination " + info.getDestination() + " is not permiited"); log.debug("Ignoring sub " + info + " destination " + info.getDestination() + " is not permiited");
return; return;
} }
// Update the packet to show where it came from. // Update the packet to show where it came from.
@ -379,11 +379,11 @@ public abstract class DemandForwardingBridgeSupport implements Bridge {
DemandSubscription sub=createDemandSubscription(info); DemandSubscription sub=createDemandSubscription(info);
if (sub != null){ if (sub != null){
addSubscription(sub); addSubscription(sub);
if(log.isTraceEnabled()) if(log.isDebugEnabled())
log.trace("Forwarding sub on "+localBroker+" from "+remoteBrokerName+" : "+info); log.debug("Forwarding sub on "+localBroker+" from "+remoteBrokerName+" : "+info);
}else { }else {
if(log.isTraceEnabled()) if(log.isDebugEnabled())
log.trace("Ignoring sub " + info + " already subscribed to matching destination"); log.debug("Ignoring sub " + info + " already subscribed to matching destination");
} }
} }
else if (data.getClass()==DestinationInfo.class){ else if (data.getClass()==DestinationInfo.class){
@ -392,14 +392,14 @@ public abstract class DemandForwardingBridgeSupport implements Bridge {
DestinationInfo destInfo = (DestinationInfo) data; DestinationInfo destInfo = (DestinationInfo) data;
BrokerId[] path=destInfo.getBrokerPath(); BrokerId[] path=destInfo.getBrokerPath();
if((path!=null&&path.length>= networkTTL)){ if((path!=null&&path.length>= networkTTL)){
if(log.isTraceEnabled()) if(log.isDebugEnabled())
log.trace("Ignoring Subscription " + destInfo + " restricted to " + networkTTL + " network hops only"); log.debug("Ignoring Subscription " + destInfo + " restricted to " + networkTTL + " network hops only");
return; return;
} }
if(contains(destInfo.getBrokerPath(),localBrokerPath[0])){ if(contains(destInfo.getBrokerPath(),localBrokerPath[0])){
// Ignore this consumer as it's a consumer we locally sent to the broker. // Ignore this consumer as it's a consumer we locally sent to the broker.
if(log.isTraceEnabled()) if(log.isDebugEnabled())
log.trace("Ignoring sub " + destInfo + " already routed through this broker once"); log.debug("Ignoring sub " + destInfo + " already routed through this broker once");
return; return;
} }

4
activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
View File

@ -194,8 +194,8 @@ public class FailoverTransport implements CompositeTransport {
} }
if(!disposed){ if(!disposed){
if( log.isTraceEnabled() )
log.debug("Waiting "+reconnectDelay+" ms before attempting connection. "); log.trace("Waiting "+reconnectDelay+" ms before attempting connection. ");
synchronized(sleepMutex){ synchronized(sleepMutex){
try{ try{
sleepMutex.wait(reconnectDelay); sleepMutex.wait(reconnectDelay);

2
assembly/project.xml
View File

@ -86,7 +86,7 @@
<!-- <!--
<dependency> <dependency>
<groupId>activemq</groupId> <groupId>${pom.groupId}</groupId>
<artifactId>activemq-web</artifactId> <artifactId>activemq-web</artifactId>
<version>${pom.currentVersion}</version> <version>${pom.currentVersion}</version>
<type>jar</type> <type>jar</type>

27
assembly/src/release/conf/activemq.xml
View File

@ -1,21 +1,24 @@
<!-- START SNIPPET: example --> <!-- START SNIPPET: example -->
<beans xmlns="http://activemq.org/config/1.0"> <beans xmlns="http://activemq.org/config/1.0">
<!-- Allows us to use system properties as variables in this configuration file -->
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker useJmx="true"> <broker useJmx="true">
<!-- Use the following to set the broker memory limit (in bytes) <!-- Use the following to set the broker memory limit (in bytes)
<memoryManager> <memoryManager>
<usageManager id="memory-manager" limit="1048576"/> <usageManager id="memory-manager" limit="1048576"/>
</memoryManager> </memoryManager>
--> -->
<!-- Use the following to configure how ActiveMQ is exposed in JMX <!-- Use the following to configure how ActiveMQ is exposed in JMX
<managementContext> <managementContext>
<managementContext connectorPort="1099" jmxDomainName="org.apache.activemq"/> <managementContext connectorPort="1099" jmxDomainName="org.apache.activemq"/>
</managementContext> </managementContext>
--> -->
<!-- In ActiveMQ 4, you can setup destination policies --> <!-- In ActiveMQ 4, you can setup destination policies -->
<destinationPolicy> <destinationPolicy>
<policyMap><policyEntries> <policyMap><policyEntries>
@ -33,7 +36,7 @@
<persistenceAdapter> <persistenceAdapter>
<journaledJDBC journalLogFiles="5" dataDirectory="../activemq-data"/> <journaledJDBC journalLogFiles="5" dataDirectory="${activemq.home}/activemq-data"/>
<!-- To use a different datasource, use th following syntax : --> <!-- To use a different datasource, use th following syntax : -->
<!-- <!--
<journaledJDBC journalLogFiles="5" dataDirectory="../activemq-data" dataSource="#postgres-ds"/> <journaledJDBC journalLogFiles="5" dataDirectory="../activemq-data" dataSource="#postgres-ds"/>

2
assembly/src/release/conf/log4j.properties
View File

@ -18,7 +18,7 @@ log4j.appender.stdout.threshold=INFO
# File appender # File appender
log4j.appender.out=org.apache.log4j.RollingFileAppender log4j.appender.out=org.apache.log4j.RollingFileAppender
log4j.appender.out.file=../data/activemq.log log4j.appender.out.file=${activemq.home}/data/activemq.log
log4j.appender.out.maxFileSize=1024KB log4j.appender.out.maxFileSize=1024KB
log4j.appender.out.maxBackupIndex=5 log4j.appender.out.maxBackupIndex=5
log4j.appender.out.append=true log4j.appender.out.append=true