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

Merge pull request #466 from coheigea/misc_fixes 

AMQ-7413 - Misc logging fixes
This commit is contained in:
Jean-Baptiste Onofré 2020-02-22 07:49:55 +01:00 committed by GitHub
parent b2e1f59870 b020cba744
commit bfb810c507
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 69 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java
View File

@ -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 {

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

@ -2163,7 +2163,7 @@ public class BrokerService implements Service {
/**
* Schedules a periodic task based on schedulePeriodForDiskLimitCheck to
* update store and temporary store limits if the amount of available space
* plus current store size is less than the existin configured limit
* plus current store size is less than the existing configured limit
*/
protected void scheduleDiskUsageLimitsCheck() throws IOException {
if (schedulePeriodForDiskUsageCheck > 0 &&

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

@ -21,7 +21,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class NetworkDestinationView implements NetworkDestinationViewMBean {
private static final Logger LOG = LoggerFactory.getLogger(NetworkDestinationViewMBean.class);
private static final Logger LOG = LoggerFactory.getLogger(NetworkDestinationView.class);
private TimeStatisticImpl timeStatistic = new TimeStatisticImpl("networkEnqueue","network messages enqueued");
private final String name;

4
activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
View File

@ -894,10 +894,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 });
}
}
}

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

@ -199,7 +199,7 @@ public class StoreDurableSubscriberCursor extends AbstractPendingMessageCursor {
if (prioritizedMessages && immediatePriorityDispatch && tsp.isPaging()) {
if (msg.getPriority() > tsp.getLastRecoveredPriority()) {
tsp.recoverMessage(node.getMessage(), true);
LOG.trace("cached high priority ({} message: {}, current paged batch priority: {}, cache size: {}", new Object[]{ msg.getPriority(), msg.getMessageId(), tsp.getLastRecoveredPriority(), tsp.batchList.size()});
LOG.trace("cached high priority ({}) message: {}, current paged batch priority: {}, cache size: {}", new Object[]{ msg.getPriority(), msg.getMessageId(), tsp.getLastRecoveredPriority(), tsp.batchList.size()});
}
}
}

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

@ -28,7 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* persist pendingCount messages pendingCount message (messages awaiting disptach
* persist pendingCount messages pendingCount message (messages awaiting dispatch
* to a consumer) cursor
*
*

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

@ -163,7 +163,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() });

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

@ -1140,7 +1140,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);
}
}

2
activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
View File

@ -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 });
}
}
}

34
activemq-broker/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
View File

@ -162,7 +162,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
TextMessage message = session.createTextMessage("Batch Message");
for (int j = 0; j < batchCount; j++) {
LOG.info("Producing bacth " + j + " of " + batchSize + " messages");
LOG.info("Producing batch " + j + " of " + batchSize + " messages");
beginTx();
for (int i = 0; i < batchSize; i++) {
@ -170,7 +170,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
}
messageSent();
commitTx();
LOG.info("Consuming bacth " + j + " of " + batchSize + " messages");
LOG.info("Consuming batch " + j + " of " + batchSize + " messages");
beginTx();
for (int i = 0; i < batchSize; i++) {
@ -187,7 +187,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
}
/**
* Sends a batch of messages and validates that the rollbacked message was
* Sends a batch of messages and validates that the rolled-back message was
* not consumed.
*
* @throws Exception
@ -200,7 +200,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
producer.send(outbound[0]);
commitTx();
// sends a message that gets rollbacked
// sends a message that gets rolled-back
beginTx();
producer.send(session.createTextMessage("I'm going to get rolled back."));
rollbackTx();
@ -224,7 +224,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
messages.add(message);
LOG.info("Received: " + message);
// validates that the rollbacked was not consumed
// validates that the rolled-back was not consumed
commitTx();
Message inbound[] = new Message[messages.size()];
messages.toArray(inbound);
@ -253,7 +253,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
messages.add(message);
LOG.info("Received: " + message);
// validates that the rollbacked was not consumed
// validates that the rolled-back was not consumed
commitTx();
Message inbound[] = new Message[messages.size()];
messages.toArray(inbound);
@ -275,7 +275,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
producer.send(outbound[0]);
commitTx();
// sends a message that gets rollbacked
// sends a message that gets rolled-back
beginTx();
producer.send(session.createTextMessage("I'm going to get rolled back."));
consumer.close();
@ -300,7 +300,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
messages.add(message);
LOG.info("Received: " + message);
// validates that the rollbacked was not consumed
// validates that the rolled-back was not consumed
commitTx();
Message inbound[] = new Message[messages.size()];
messages.toArray(inbound);
@ -321,7 +321,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
producer.send(outbound[0]);
commitTx();
// sends a message that gets rollbacked
// sends a message that gets rolled-back
beginTx();
producer.send(session.createTextMessage("I'm going to get rolled back."));
consumer.close();
@ -348,7 +348,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
messages.add(message);
LOG.info("Received: " + message);
// validates that the rollbacked was not consumed
// validates that the rolled-back was not consumed
commitTx();
Message inbound[] = new Message[messages.size()];
messages.toArray(inbound);
@ -356,7 +356,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
}
/**
* Sends a batch of messages and validates that the rollbacked message was
* Sends a batch of messages and validates that the rolled-back message was
* redelivered.
*
* @throws Exception
@ -407,7 +407,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
}
/**
* Sends a batch of messages and validates that the rollbacked message was
* Sends a batch of messages and validates that the rolled-back message was
* redelivered.
*
* @throws Exception
@ -461,7 +461,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
}
/**
* Sends a batch of messages and validates that the rollbacked message was
* Sends a batch of messages and validates that the rolled-back message was
* not consumed.
*
* @throws Exception
@ -487,12 +487,12 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
LOG.info("Received: " + message);
}
// validates that the rollbacked was not consumed
// validates that the rolled-back was not consumed
commitTx();
}
/**
* Perform the test that validates if the rollbacked message was redelivered
* Perform the test that validates if the rolled-back message was redelivered
* multiple times.
*
* @throws Exception
@ -504,7 +504,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
}
/**
* Sends a batch of messages and validates that the rollbacked message was
* Sends a batch of messages and validates that the rolled-back message was
* not consumed. This test differs by setting the message prefetch to one.
*
* @throws Exception
@ -515,7 +515,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
}
/**
* Sends a batch of messages and and validates that the rollbacked message
* Sends a batch of messages and and validates that the rolled-back message
* was redelivered. This test differs by setting the message prefetch to
* one.
*

2
activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
View File

@ -819,7 +819,7 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC
try {
session.sendAck(ackToSend,true);
} catch (JMSException e) {
LOG.error(getConsumerId() + " failed to delivered acknowledgements", e);
LOG.error(getConsumerId() + " failed to deliver acknowledgements", e);
} finally {
deliveryingAcknowledgements.set(false);
}

2
activemq-client/src/main/java/org/apache/activemq/jndi/JNDIReferenceFactory.java
View File

@ -40,7 +40,7 @@ public class JNDIReferenceFactory implements ObjectFactory {
/**
* This will be called by a JNDIprovider when a Reference is retrieved from
* a JNDI store - and generates the orignal instance
* a JNDI store - and generates the original instance
*
* @param object the Reference object
* @param name the JNDI name

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

@ -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);

17
activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
View File

@ -291,25 +291,28 @@ public class MulticastDiscoveryAgent implements DiscoveryAgent, Runnable {
discoveryURI = new URI(DEFAULT_DISCOVERY_URI_STRING);
}
if (LOG.isTraceEnabled())
if (LOG.isTraceEnabled()) {
LOG.trace("start - discoveryURI = " + discoveryURI);
}
String myHost = discoveryURI.getHost();
int myPort = discoveryURI.getPort();
if( DEFAULT_HOST_STR.equals(myHost) )
if (DEFAULT_HOST_STR.equals(myHost)) {
myHost = DEFAULT_HOST_IP;
}
if(myPort < 0 )
if (myPort < 0) {
myPort = DEFAULT_PORT;
}
if (LOG.isTraceEnabled()) {
LOG.trace("start - myHost = " + myHost);
LOG.trace("start - myPort = " + myPort);
LOG.trace("start - group = " + group );
LOG.trace("start - interface = " + mcInterface );
LOG.trace("start - network interface = " + mcNetworkInterface );
LOG.trace("start - join network interface = " + mcJoinNetworkInterface );
LOG.trace("start - group = " + group);
LOG.trace("start - interface = " + mcInterface);
LOG.trace("start - network interface = " + mcNetworkInterface);
LOG.trace("start - join network interface = " + mcJoinNetworkInterface);
}
this.inetAddress = InetAddress.getByName(myHost);

2
activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java
View File

@ -184,7 +184,7 @@ public class IdGenerator {
/**
* From a generated id - return the seed (i.e. minus the count)
*
* @param id the generated identifer
* @param id the generated identifier
* @return the seed
*/
public static String getSeedFromId(String id) {

4
activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSConnection.java
View File

@ -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();
}
}

2
activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoader.java
View File

@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;
public class PropertiesLoader {
private static final Logger LOG = LoggerFactory.getLogger(PropertiesLoader.class);
static Map<FileNameKey, ReloadableProperties> staticCache = new HashMap<FileNameKey, ReloadableProperties>();
static final Map<FileNameKey, ReloadableProperties> staticCache = new HashMap<FileNameKey, ReloadableProperties>();
protected boolean debug;
public void init(Map options) {

2
activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledConnection.java
View File

@ -256,7 +256,7 @@ public class PooledConnection implements TopicConnection, QueueConnection, Poole
try {
session.close();
} catch (JMSException ex) {
LOG.info("failed to close laoned Session \"" + session + "\" on closing pooled connection: " + ex.getMessage());
LOG.info("failed to close loaned Session \"" + session + "\" on closing pooled connection: " + ex.getMessage());
}
}
loanedSessions.clear();

6
activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/JmsPoolTestSupport.java
View File

@ -43,7 +43,7 @@ public class JmsPoolTestSupport {
@Before
public void setUp() throws Exception {
LOG.info("========== start " + getTestName() + " ==========");
LOG.info("========== start {} ==========", getTestName());
}
@After
@ -54,11 +54,11 @@ 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);
}
}
LOG.info("========== tearDown " + getTestName() + " ==========");
LOG.info("========== tearDown {} ==========", getTestName());
}
public String getTestName() {

8
activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java
View File

@ -198,11 +198,11 @@ public class MultiKahaDBPersistenceAdapter extends LockableServiceSupport implem
if (filteredAdapter.getDestination() == matchAll && filteredAdapter.isPerDestination()) {
filteredAdapter = addAdapter(filteredAdapter, destination);
if (LOG.isTraceEnabled()) {
LOG.info("created per destination adapter for: " + destination + ", " + result);
LOG.trace("created per destination adapter for: " + destination + ", " + result);
}
}
startAdapter(filteredAdapter.getPersistenceAdapter(), destination.getQualifiedName());
LOG.debug("destination {} matched persistence adapter {}", new Object[]{destination.getQualifiedName(), filteredAdapter.getPersistenceAdapter()});
LOG.debug("destination {} matched persistence adapter {}", destination.getQualifiedName(), filteredAdapter.getPersistenceAdapter());
return filteredAdapter.getPersistenceAdapter();
}
@ -330,11 +330,11 @@ public class MultiKahaDBPersistenceAdapter extends LockableServiceSupport implem
if (adapterDir != null) {
if (IOHelper.deleteFile(adapterDir)) {
if (LOG.isTraceEnabled()) {
LOG.info("deleted per destination adapter directory for: " + destination);
LOG.trace("deleted per destination adapter directory for: " + destination);
}
} else {
if (LOG.isTraceEnabled()) {
LOG.info("failed to deleted per destination adapter directory for: " + destination);
LOG.trace("failed to deleted per destination adapter directory for: " + destination);
}
}
}

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

@ -753,7 +753,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()) {

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

@ -355,4 +355,4 @@ public class ActiveMQResourceAdapter extends ActiveMQConnectionSupport implement
}
}
}

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

@ -132,7 +132,7 @@ public class LocalAndXATransaction implements XAResource, LocalTransaction {
public Xid[] recover(int arg0) throws XAException {
Xid[] answer = null;
LOG.trace("{} recover({})", new Object[]{this, arg0});
LOG.trace("{} recover({})", this, arg0);
answer = transactionContext.recover(arg0);
LOG.trace("{} recover({}) = {}", new Object[]{this, arg0, answer});
return answer;