You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2020/02/22 06:53:21 UTC
[activemq] 08/08: Fix some incorrect SLF4J logger calls
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
commit 8b30145ff3fb9f9343ae6db9e9a69c0c22404ea9
Author: Daniel Trebbien <dt...@gmail.com>
AuthorDate: Fri Jul 28 18:58:05 2017 -0700
Fix some incorrect SLF4J logger calls
In some cases, there were an inconsistent number of formatting anchors.
In other cases, formatting anchors were used, but because the
trace/debug/info/warn/error(String, Throwable) variant was used, the
string is a message string rather than a format string.
These issues were found by SLF4J Helper for NetBeans IDE:
http://plugins.netbeans.org/plugin/72557/
(cherry picked from commit b020cba74470fffff7383de5f5400bff2b4f99c8)
---
.../org/apache/activemq/transport/amqp/client/AmqpConnection.java | 2 +-
.../src/main/java/org/apache/activemq/broker/region/Topic.java | 4 ++--
.../activemq/broker/region/policy/AbortSlowAckConsumerStrategy.java | 2 +-
.../org/apache/activemq/network/DemandForwardingBridgeSupport.java | 2 +-
.../main/java/org/apache/activemq/network/jms/DestinationBridge.java | 2 +-
.../java/org/apache/activemq/transport/AbstractInactivityMonitor.java | 2 +-
.../test/java/org/apache/activemq/transport/ws/MQTTWSConnection.java | 4 ++--
.../test/java/org/apache/activemq/jms/pool/JmsPoolTestSupport.java | 2 +-
.../org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java | 2 +-
.../src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java | 2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java
index 3fe3ab6..31eacc3 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java
@@ -228,7 +228,7 @@ public class AmqpConnection extends AmqpAbstractResource<Connection> implements
request.sync(closeTimeout, TimeUnit.MILLISECONDS);
}
} catch (IOException e) {
- LOG.warn("Error caught while closing Provider: ", e.getMessage());
+ LOG.warn("Error caught while closing Provider: {}", e.getMessage());
} finally {
if (transport != null) {
try {
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
index c30916c..59190f1 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
@@ -877,10 +877,10 @@ public class Topic extends BaseDestination implements Task {
try {
durableTopicSubscription.dispatchPending();
} catch (IOException exception) {
- LOG.warn("After clear of pending, failed to dispatch to: {}, for: {}, pending: {}", new Object[]{
+ LOG.warn("After clear of pending, failed to dispatch to: {}, for: {}, pending: {}, exception: {}", new Object[]{
durableTopicSubscription,
destination,
- durableTopicSubscription.pending }, exception);
+ durableTopicSubscription.pending, exception });
}
}
}
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowAckConsumerStrategy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowAckConsumerStrategy.java
index 1bbca52..06be1f9 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowAckConsumerStrategy.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowAckConsumerStrategy.java
@@ -146,7 +146,7 @@ public class AbortSlowAckConsumerStrategy extends AbortSlowConsumerStrategy {
if (getMaxSlowDuration() > 0 && (entry.getValue().markCount * getCheckPeriod() >= getMaxSlowDuration()) ||
getMaxSlowCount() > 0 && entry.getValue().slowCount >= getMaxSlowCount()) {
- LOG.trace("Transferring consumer{} to the abort list: {} slow duration = {}, slow count = {}",
+ LOG.trace("Transferring consumer {} to the abort list: {} slow duration = {}, slow count = {}",
new Object[]{ entry.getKey().getConsumerInfo().getConsumerId(),
entry.getValue().markCount * getCheckPeriod(),
entry.getValue().getSlowCount() });
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 ddf5709..ca165c0 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
@@ -1139,7 +1139,7 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br
}
} catch (Exception e) {
- LOG.warn("failed to fire forward failure advisory, cause: {}", e);
+ LOG.warn("failed to fire forward failure advisory, cause: {}", (Object)e);
LOG.debug("detail", e);
}
}
diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
index 9595aee..4a1a78c 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
@@ -149,7 +149,7 @@ public abstract class DestinationBridge implements Service, MessageListener {
return;
} catch (Exception e) {
- LOG.info("failed to forward message on attempt: {} reason: {} message: {}", new Object[]{ attempt, e, message }, e);
+ LOG.info("failed to forward message on attempt: {} reason: {} message: {}", new Object[]{ attempt, e, message });
}
}
}
diff --git a/activemq-client/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java b/activemq-client/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java
index fa46a0e..bef8d7f 100644
--- a/activemq-client/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java
@@ -259,7 +259,7 @@ public abstract class AbstractInactivityMonitor extends TransportFilter {
}
} else {
if (LOG.isTraceEnabled()) {
- LOG.trace("Message received since last read check, resetting flag: ");
+ LOG.trace("Message received since last read check, resetting flag: {}", this);
}
}
commandReceived.set(false);
diff --git a/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSConnection.java b/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSConnection.java
index fd42dc6..73cc0e6 100644
--- a/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSConnection.java
+++ b/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSConnection.java
@@ -191,7 +191,7 @@ public class MQTTWSConnection extends WebSocketAdapter implements WebSocketListe
try {
frame = (MQTTFrame)wireFormat.unmarshal(new ByteSequence(data, offset, length));
} catch (IOException e) {
- LOG.error("Could not decode incoming MQTT Frame: ", e.getMessage());
+ LOG.error("Could not decode incoming MQTT Frame: {}", e.getMessage());
connection.close();
}
@@ -245,7 +245,7 @@ public class MQTTWSConnection extends WebSocketAdapter implements WebSocketListe
connection.close();
}
} catch (Exception e) {
- LOG.error("Could not decode incoming MQTT Frame: ", e.getMessage());
+ LOG.error("Could not decode incoming MQTT Frame: {}", e.getMessage());
connection.close();
}
}
diff --git a/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/JmsPoolTestSupport.java b/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/JmsPoolTestSupport.java
index 69c5295..c32134f 100644
--- a/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/JmsPoolTestSupport.java
+++ b/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/JmsPoolTestSupport.java
@@ -54,7 +54,7 @@ public class JmsPoolTestSupport {
brokerService.waitUntilStopped();
brokerService = null;
} catch (Exception ex) {
- LOG.warn("Suppress error on shutdown: {}", ex);
+ LOG.warn("Suppress error on shutdown: {}", (Object)ex);
}
}
diff --git a/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java b/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java
index d1cc80e..266d0b6 100644
--- a/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java
+++ b/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java
@@ -749,7 +749,7 @@ public class MQTTProtocolConverter {
if (response.isException()) {
Throwable error = ((ExceptionResponse) response).getException();
LOG.warn("Failed to send MQTT Publish: {}: {}", command, error.getMessage());
- LOG.trace("Error trace: {}", error);
+ LOG.trace("Error trace: {}", (Object)error);
}
switch (command.qos()) {
diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
index cf0be3e..d25decb 100644
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
+++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
@@ -461,4 +461,4 @@ public class ActiveMQResourceAdapter extends ActiveMQConnectionSupport implement
}
- }
+}