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

Logging cleanup, don't need all the if checks, use string substitution 

more effectively.
This commit is contained in:
Timothy Bish 2013-09-19 15:18:02 -04:00
parent c387522217
commit c7d33ad5e4
2 changed files with 18 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,8 +80,8 @@ public abstract class AbstractInactivityMonitor extends TransportFilter {
long now = System.currentTimeMillis();
long elapsed = (now - lastRunTime);
if (lastRunTime != 0 && LOG.isDebugEnabled()) {
LOG.debug("" + elapsed + " ms elapsed since last read check.");
if (lastRunTime != 0) {
LOG.debug("{}ms elapsed since last read check.", elapsed);
}
// Perhaps the timer executed a read check late.. and then executes
@ -89,10 +89,9 @@ public abstract class AbstractInactivityMonitor extends TransportFilter {
// read checks to be small..
// If less than 90% of the read check Time elapsed then abort this
// readcheck.
if (!allowReadCheck(elapsed)) { // FUNKY qdox bug does not allow me
// to inline this expression.
LOG.debug("Aborting read check.. Not enough time elapsed since last read check.");
// read check.
if (!allowReadCheck(elapsed)) {
LOG.debug("Aborting read check...Not enough time elapsed since last read check.");
return;
}
@ -116,9 +115,8 @@ public abstract class AbstractInactivityMonitor extends TransportFilter {
@Override
public void run() {
long now = System.currentTimeMillis();
if (lastRunTime != 0 && LOG.isDebugEnabled()) {
LOG.debug(this + " " + (now - lastRunTime) + " ms elapsed since last write check.");
if (lastRunTime != 0) {
LOG.debug("{}: {}ms elapsed since last write check.", this, (now - lastRunTime));
}
lastRunTime = now;
writeCheck();
@ -149,25 +147,18 @@ public abstract class AbstractInactivityMonitor extends TransportFilter {
final void writeCheck() {
if (inSend.get()) {
if (LOG.isTraceEnabled()) {
LOG.trace("A send is in progress");
}
LOG.trace("Send in progress. Skipping write check.");
return;
}
if (!commandSent.get() && useKeepAlive && monitorStarted.get() && !ASYNC_TASKS.isTerminating() && !ASYNC_TASKS.isTerminated()) {
if (LOG.isTraceEnabled()) {
LOG.trace(this + " no message sent since last write check, sending a KeepAliveInfo");
}
LOG.trace("{} no message sent since last write check, sending a KeepAliveInfo", this);
try {
ASYNC_TASKS.execute(new Runnable() {
@Override
public void run() {
if (LOG.isDebugEnabled()) {
LOG.debug("Running {}", this);
}
LOG.debug("Running {}", this);
if (monitorStarted.get()) {
try {
// If we can't get the lock it means another
@ -200,9 +191,7 @@ public abstract class AbstractInactivityMonitor extends TransportFilter {
}
}
} else {
if (LOG.isTraceEnabled()) {
LOG.trace(this + " message sent since last write check, resetting flag");
}
LOG.trace("{} message sent since last write check, resetting flag.", this);
}
commandSent.set(false);
@ -212,24 +201,17 @@ public abstract class AbstractInactivityMonitor extends TransportFilter {
int currentCounter = next.getReceiveCounter();
int previousCounter = lastReceiveCounter.getAndSet(currentCounter);
if (inReceive.get() || currentCounter != previousCounter) {
if (LOG.isTraceEnabled()) {
LOG.trace("A receive is in progress");
}
LOG.trace("A receive is in progress, skipping read check.");
return;
}
if (!commandReceived.get() && monitorStarted.get() && !ASYNC_TASKS.isTerminating() && !ASYNC_TASKS.isTerminated()) {
if (LOG.isDebugEnabled()) {
LOG.debug("No message received since last read check for " + toString() + ". Throwing InactivityIOException.");
}
LOG.debug("No message received since last read check for {}. Throwing InactivityIOException.", this);
try {
ASYNC_TASKS.execute(new Runnable() {
@Override
public void run() {
if (LOG.isDebugEnabled()) {
LOG.debug("Running {}", this);
}
LOG.debug("Running {}", this);
onException(new InactivityIOException("Channel was inactive for too (>" + readCheckTime + ") long: " + next.getRemoteAddress()));
}

12
activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompInactivityMonitor.java
View File

@ -49,7 +49,7 @@ public class StompInactivityMonitor extends AbstractInactivityMonitor {
}
@Override
protected void processOutboundWireFormatInfo(WireFormatInfo info) throws IOException{
protected void processOutboundWireFormatInfo(WireFormatInfo info) throws IOException {
}
@Override
@ -59,13 +59,9 @@ public class StompInactivityMonitor extends AbstractInactivityMonitor {
return false;
}
LOG.debug("Stomp Inactivity Monitor read check: " + getReadCheckTime() +
", write check: " + getWriteCheckTime());
LOG.debug("Stomp Inactivity Monitor read check interval: {}ms, write check interval: {}ms",
getReadCheckTime(), getWriteCheckTime());
if (this.getReadCheckTime() >= 0 && this.getWriteCheckTime() >= 0) {
return true;
}
return false;
return this.getReadCheckTime() >= 0 && this.getWriteCheckTime() >= 0;
}
}