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

Merge pull request #448 from PascalSchumacher/fix_unused_format_arguments_in_log_messages 

Fix unused format arguments in log messages.
This commit is contained in:
Jean-Baptiste Onofré 2020-02-13 07:53:32 +01:00 committed by GitHub
parent ee16d9df5c 6764511fa1
commit 4ecdd5a2a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpSender.java
View File

@ -279,7 +279,7 @@ public class AmqpSender extends AmqpAbstractLink<Sender> {
// Rejection is a terminal outcome, we poison the message for dispatch to // Rejection is a terminal outcome, we poison the message for dispatch to
// the DLQ. If a custom redelivery policy is used on the broker the message // the DLQ. If a custom redelivery policy is used on the broker the message
// can still be redelivered based on the configation of that policy. // can still be redelivered based on the configation of that policy.
LOG.trace("onDelivery: Rejected state = {}, message poisoned.", state, md.getRedeliveryCounter()); LOG.trace("onDelivery: Rejected state = {}, message poisoned.", state);
settle(delivery, MessageAck.POSION_ACK_TYPE); settle(delivery, MessageAck.POSION_ACK_TYPE);
} else if (state instanceof Released) { } else if (state instanceof Released) {
LOG.trace("onDelivery: Released state = {}", state); LOG.trace("onDelivery: Released state = {}", state);

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

@ -581,7 +581,7 @@ public class TransportConnection implements Connection, Task, CommandVisitor {
if (consumerExchange != null) { if (consumerExchange != null) {
broker.acknowledge(consumerExchange, ack); broker.acknowledge(consumerExchange, ack);
} else if (ack.isInTransaction()) { } else if (ack.isInTransaction()) {
LOG.warn("no matching consumer, ignoring ack {}", consumerExchange, ack); LOG.warn("no matching consumer {}, ignoring ack {}", consumerExchange, ack);
} }
return null; return null;
} }

2
activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
View File

@ -2092,7 +2092,7 @@ public class Queue extends BaseDestination implements Task, UsageListener, Index
ConnectionContext connectionContext = createConnectionContext(); ConnectionContext connectionContext = createConnectionContext();
dropMessage(ref); dropMessage(ref);
if (gotToTheStore(ref.getMessage())) { if (gotToTheStore(ref.getMessage())) {
LOG.debug("Duplicate message {} from cursor, removing from store", this, ref.getMessage()); LOG.debug("Duplicate message {} from cursor, removing from store", ref.getMessage());
store.removeMessage(connectionContext, new MessageAck(ref.getMessage(), MessageAck.POSION_ACK_TYPE, 1)); store.removeMessage(connectionContext, new MessageAck(ref.getMessage(), MessageAck.POSION_ACK_TYPE, 1));
} }
broker.getRoot().sendToDeadLetterQueue(connectionContext, ref.getMessage(), null, new Throwable("duplicate paged in from cursor for " + destination)); broker.getRoot().sendToDeadLetterQueue(connectionContext, ref.getMessage(), null, new Throwable("duplicate paged in from cursor for " + destination));

4
activemq-client/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransport.java
View File

@ -112,7 +112,7 @@ public class DiscoveryTransport extends TransportFilter implements DiscoveryList
try { try {
((Suspendable)discoveryAgent).suspend(); ((Suspendable)discoveryAgent).suspend();
} catch (Exception e) { } catch (Exception e) {
LOG.warn("Exception suspending discoverAgent: ", discoveryAgent); LOG.warn("Exception suspending discoverAgent: {}", discoveryAgent);
} }
} }
super.transportResumed(); super.transportResumed();
@ -124,7 +124,7 @@ public class DiscoveryTransport extends TransportFilter implements DiscoveryList
try { try {
((Suspendable)discoveryAgent).resume(); ((Suspendable)discoveryAgent).resume();
} catch (Exception e) { } catch (Exception e) {
LOG.warn("Exception resuming discoverAgent: ", discoveryAgent); LOG.warn("Exception resuming discoverAgent: {}", discoveryAgent);
} }
} }
super.transportInterupted(); super.transportInterupted();

2
activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
View File

@ -133,7 +133,7 @@ public class TcpTransportFactory extends TransportFactory {
String localString = location.getScheme() + ":/" + path; String localString = location.getScheme() + ":/" + path;
localLocation = new URI(localString); localLocation = new URI(localString);
} catch (Exception e) { } catch (Exception e) {
LOG.warn("path isn't a valid local location for TcpTransport to use", e.getMessage()); LOG.warn("path isn't a valid local location for TcpTransport to use: {}", e.getMessage());
if(LOG.isDebugEnabled()) { if(LOG.isDebugEnabled()) {
LOG.debug("Failure detail", e); LOG.debug("Failure detail", e);
} }

4
activemq-client/src/main/java/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java
View File

@ -118,7 +118,7 @@ public class ClassLoadingAwareObjectInputStream extends ObjectInputStream {
// check for simple types first // check for simple types first
final Class<?> clazz = loadSimpleType(className); final Class<?> clazz = loadSimpleType(className);
if (clazz != null) { if (clazz != null) {
LOG.trace("Loaded class: {} as simple type -> ", className, clazz); LOG.trace("Loaded class: {} as simple type -> {}", className, clazz);
return clazz; return clazz;
} }
@ -128,7 +128,7 @@ public class ClassLoadingAwareObjectInputStream extends ObjectInputStream {
try { try {
Class<?> answer = Class.forName(className, false, loader); Class<?> answer = Class.forName(className, false, loader);
if (LOG.isTraceEnabled()) { if (LOG.isTraceEnabled()) {
LOG.trace("Loaded class: {} using classloader: {} -> ", new Object[]{className, cl, answer}); LOG.trace("Loaded class: {} using classloader: {} -> {}", className, cl, answer);
} }
return answer; return answer;
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {

2
activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java
View File

@ -752,7 +752,7 @@ public class MQTTProtocolConverter {
public void onResponse(MQTTProtocolConverter converter, Response response) throws IOException { public void onResponse(MQTTProtocolConverter converter, Response response) throws IOException {
if (response.isException()) { if (response.isException()) {
Throwable error = ((ExceptionResponse) response).getException(); Throwable error = ((ExceptionResponse) response).getException();
LOG.warn("Failed to send MQTT Publish: ", command, error.getMessage()); LOG.warn("Failed to send MQTT Publish: {}: {}", command, error.getMessage());
LOG.trace("Error trace: {}", error); LOG.trace("Error trace: {}", error);
} }

2
activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionImpl.java
View File

@ -197,7 +197,7 @@ public class ServerSessionImpl implements ServerSession, InboundContext, Work, D
pool.returnToPool(this); pool.returnToPool(this);
break; break;
} else { } else {
log.debug("Session has session has more work to do b/c of unconsumed", this); log.debug("Session {} has more work to do b/c of unconsumed", this);
} }
} }
} }