You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2014/04/01 00:42:40 UTC
[1/2] git commit: https://issues.apache.org/jira/browse/AMQ-5122
Repository: activemq
Updated Branches:
refs/heads/trunk f4a8b117c -> a554c7ca8
https://issues.apache.org/jira/browse/AMQ-5122
tone down logging of warn to just exception message, full exception
logged as debug.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/bc326c8e
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/bc326c8e
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/bc326c8e
Branch: refs/heads/trunk
Commit: bc326c8e5764c791fc4bb2c7e1aecb258c8212ad
Parents: f4a8b11
Author: Timothy Bish <ta...@gmai.com>
Authored: Mon Mar 31 18:34:58 2014 -0400
Committer: Timothy Bish <ta...@gmai.com>
Committed: Mon Mar 31 18:34:58 2014 -0400
----------------------------------------------------------------------
.../org/apache/activemq/network/DiscoveryNetworkConnector.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/bc326c8e/activemq-broker/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java b/activemq-broker/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
index d9cb0c6..feef9d5 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
@@ -153,7 +153,7 @@ public class DiscoveryNetworkConnector extends NetworkConnector implements Disco
} catch (Exception e) {
ServiceSupport.dispose(localTransport);
ServiceSupport.dispose(remoteTransport);
- LOG.warn("Could not start network bridge between: {} and: {} due to: {}", new Object[]{ localURI, uri, e });
+ LOG.warn("Could not start network bridge between: {} and: {} due to: {}", new Object[]{ localURI, uri, e.getMessage() });
LOG.debug("Start failure exception: ", e);
try {
// Will remove bridge and active event.
[2/2] git commit: https://issues.apache.org/jira/browse/AMQ-5052
Posted by ta...@apache.org.
https://issues.apache.org/jira/browse/AMQ-5052
tone down noisy log
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/a554c7ca
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/a554c7ca
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/a554c7ca
Branch: refs/heads/trunk
Commit: a554c7ca84a7ed7f9957cbdb7abaaeb9c309f227
Parents: bc326c8
Author: Timothy Bish <ta...@gmai.com>
Authored: Mon Mar 31 18:42:37 2014 -0400
Committer: Timothy Bish <ta...@gmai.com>
Committed: Mon Mar 31 18:42:37 2014 -0400
----------------------------------------------------------------------
.../network/DemandForwardingBridgeSupport.java | 34 ++++++++++++++++++--
1 file changed, 32 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/a554c7ca/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
index 555f0ec..3a6f88e 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
@@ -36,6 +36,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import javax.management.ObjectName;
+
import org.apache.activemq.DestinationDoesNotExistException;
import org.apache.activemq.Service;
import org.apache.activemq.advisory.AdvisoryBroker;
@@ -50,7 +51,35 @@ import org.apache.activemq.broker.region.Region;
import org.apache.activemq.broker.region.RegionBroker;
import org.apache.activemq.broker.region.Subscription;
import org.apache.activemq.broker.region.policy.PolicyEntry;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.command.ActiveMQTempDestination;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.command.BrokerId;
+import org.apache.activemq.command.BrokerInfo;
+import org.apache.activemq.command.Command;
+import org.apache.activemq.command.ConnectionError;
+import org.apache.activemq.command.ConnectionId;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.DestinationInfo;
+import org.apache.activemq.command.ExceptionResponse;
+import org.apache.activemq.command.KeepAliveInfo;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.MessageDispatch;
+import org.apache.activemq.command.MessageId;
+import org.apache.activemq.command.NetworkBridgeFilter;
+import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.command.RemoveInfo;
+import org.apache.activemq.command.RemoveSubscriptionInfo;
+import org.apache.activemq.command.Response;
+import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.command.ShutdownInfo;
+import org.apache.activemq.command.SubscriptionInfo;
+import org.apache.activemq.command.WireFormatInfo;
import org.apache.activemq.filter.DestinationFilter;
import org.apache.activemq.filter.MessageEvaluationContext;
import org.apache.activemq.security.SecurityContext;
@@ -701,7 +730,7 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br
BrokerId[] path = info.getBrokerPath();
if (info.isBrowser()) {
- LOG.info("{} Ignoring sub from {}, browsers explicitly suppressed", configuration.getBrokerName(), remoteBrokerName);
+ LOG.debug("{} Ignoring sub from {}, browsers explicitly suppressed", configuration.getBrokerName(), remoteBrokerName);
return;
}
@@ -1548,6 +1577,7 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br
return mbeanObjectName;
}
+ @Override
public void resetStats() {
enqueueCounter.set(0);
dequeueCounter.set(0);