You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2009/12/11 15:46:17 UTC
svn commit: r889642 - in
/camel/trunk/camel-core/src/main/java/org/apache/camel: component/file/
component/file/strategy/ component/seda/ impl/ impl/converter/ processor/
Author: janstey
Date: Fri Dec 11 14:46:15 2009
New Revision: 889642
URL: http://svn.apache.org/viewvc?rev=889642&view=rev
Log:
guard some logging statements
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendAsyncProcessor.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java?rev=889642&r1=889641&r2=889642&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java Fri Dec 11 14:46:15 2009
@@ -59,7 +59,9 @@
// before we poll is there anything we need to check ? Such as are we
// connected to the FTP Server Still ?
if (!prePollCheck()) {
- log.debug("Skipping pool as pre poll check returned false");
+ if (log.isDebugEnabled()) {
+ log.debug("Skipping pool as pre poll check returned false");
+ }
}
// gather list of files to process
@@ -105,7 +107,9 @@
// limit if needed
if (maxMessagesPerPoll > 0 && total > maxMessagesPerPoll) {
- log.debug("Limiting to maximum messages to poll " + maxMessagesPerPoll + " as there was " + total + " messages in this poll.");
+ if (log.isDebugEnabled()) {
+ log.debug("Limiting to maximum messages to poll " + maxMessagesPerPoll + " as there was " + total + " messages in this poll.");
+ }
total = maxMessagesPerPoll;
}
@@ -165,7 +169,9 @@
boolean begin = processStrategy.begin(operations, endpoint, exchange, file);
if (!begin) {
- log.debug(endpoint + " cannot begin processing file: " + file);
+ if (log.isDebugEnabled()) {
+ log.debug(endpoint + " cannot begin processing file: " + file);
+ }
// remove file from the in progress list as its no longer in progress
endpoint.getInProgressRepository().remove(file.getFileName());
return;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java?rev=889642&r1=889641&r2=889642&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java Fri Dec 11 14:46:15 2009
@@ -171,7 +171,9 @@
boolean absolute = file.isAbsolute();
if (directory != null) {
if (!operations.buildDirectory(directory, absolute)) {
- log.debug("Cannot build directory [" + directory + "] (could be because of denied permissions)");
+ if (log.isDebugEnabled()) {
+ log.debug("Cannot build directory [" + directory + "] (could be because of denied permissions)");
+ }
}
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java?rev=889642&r1=889641&r2=889642&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java Fri Dec 11 14:46:15 2009
@@ -111,7 +111,9 @@
Thread.sleep(1000);
return false;
} catch (InterruptedException e) {
- LOG.debug("Sleep interrupted while waiting for exclusive read lock, so breaking out");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Sleep interrupted while waiting for exclusive read lock, so breaking out");
+ }
return true;
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java?rev=889642&r1=889641&r2=889642&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java Fri Dec 11 14:46:15 2009
@@ -125,12 +125,16 @@
}
private boolean sleep() {
- LOG.trace("Exclusive read lock not granted. Sleeping for 1000 millis.");
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Exclusive read lock not granted. Sleeping for 1000 millis.");
+ }
try {
Thread.sleep(1000);
return false;
} catch (InterruptedException e) {
- LOG.debug("Sleep interrupted while waiting for exclusive read lock, so breaking out");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Sleep interrupted while waiting for exclusive read lock, so breaking out");
+ }
return true;
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java?rev=889642&r1=889641&r2=889642&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java Fri Dec 11 14:46:15 2009
@@ -84,8 +84,10 @@
// noop
}
- private boolean sleep() {
- LOG.trace("Exclusive read lock not granted. Sleeping for 1000 millis.");
+ private boolean sleep() {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Exclusive read lock not granted. Sleeping for 1000 millis.");
+ }
try {
Thread.sleep(1000);
return false;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java?rev=889642&r1=889641&r2=889642&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java Fri Dec 11 14:46:15 2009
@@ -76,7 +76,9 @@
try {
exchange = queue.poll(1000, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
- LOG.debug("Sleep interrupted, are we stopping? " + (isStopping() || isStopped()));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Sleep interrupted, are we stopping? " + (isStopping() || isStopped()));
+ }
continue;
}
if (exchange != null) {
@@ -87,11 +89,15 @@
getExceptionHandler().handleException(e);
}
} else {
- LOG.warn("This consumer is stopped during polling an exchange, so putting it back on the seda queue: " + exchange);
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("This consumer is stopped during polling an exchange, so putting it back on the seda queue: " + exchange);
+ }
try {
queue.put(exchange);
} catch (InterruptedException e) {
- LOG.debug("Sleep interrupted, are we stopping? " + (isStopping() || isStopped()));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Sleep interrupted, are we stopping? " + (isStopping() || isStopped()));
+ }
continue;
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=889642&r1=889641&r2=889642&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Fri Dec 11 14:46:15 2009
@@ -1021,7 +1021,9 @@
if (isStreamCaching()) {
// only add a new stream cache if not already configured
if (StreamCaching.getStreamCaching(this) == null) {
- LOG.debug("StreamCaching is enabled");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("StreamCaching is enabled");
+ }
addInterceptStrategy(new StreamCaching());
}
}
@@ -1166,7 +1168,9 @@
ServiceStatus status = getRouteStatus(key);
if (status != null && status.isStarted()) {
- LOG.debug("Route " + key + " is already started");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Route " + key + " is already started");
+ }
} else {
routeServices.put(key, routeService);
if (shouldStartRoutes()) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java?rev=889642&r1=889641&r2=889642&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java Fri Dec 11 14:46:15 2009
@@ -50,7 +50,9 @@
getLog().debug("Found language: " + name + " in registry: " + bean);
}
} catch (Exception e) {
- getLog().debug("Ignored error looking up bean: " + name + ". Error: " + e);
+ if (getLog().isDebugEnabled()) {
+ getLog().debug("Ignored error looking up bean: " + name + ". Error: " + e);
+ }
}
if (bean != null) {
if (bean instanceof Language) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java?rev=889642&r1=889641&r2=889642&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java Fri Dec 11 14:46:15 2009
@@ -415,20 +415,28 @@
found = true;
break;
} catch (ClassNotFoundException e) {
- log.debug("Cannot find class '" + fqn + "' in classloader: " + classLoader
- + ". Reason: " + e, e);
+ if (log.isDebugEnabled()) {
+ log.debug("Cannot find class '" + fqn + "' in classloader: " + classLoader
+ + ". Reason: " + e, e);
+ }
} catch (NoClassDefFoundError e) {
- log.debug("Cannot find the class definition '" + fqn + "' in classloader: " + classLoader
- + ". Reason: " + e, e);
+ if (log.isDebugEnabled()) {
+ log.debug("Cannot find the class definition '" + fqn + "' in classloader: " + classLoader
+ + ". Reason: " + e, e);
+ }
}
}
if (!found) {
- // use debug to avoid being noisy in logs
- log.debug("Cannot find class '" + fqn + "' in any classloaders: " + set);
+ if (log.isDebugEnabled()) {
+ // use debug to avoid being noisy in logs
+ log.debug("Cannot find class '" + fqn + "' in any classloaders: " + set);
+ }
}
} catch (Exception e) {
- log.warn("Cannot examine class '" + fqn + "' due to a " + e.getClass().getName()
- + " with message: " + e.getMessage(), e);
+ if (log.isWarnEnabled()) {
+ log.warn("Cannot examine class '" + fqn + "' due to a " + e.getClass().getName()
+ + " with message: " + e.getMessage(), e);
+ }
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java?rev=889642&r1=889641&r2=889642&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java Fri Dec 11 14:46:15 2009
@@ -90,11 +90,15 @@
}
protected void doStart() throws Exception {
- log.debug("Starting service pool: " + this);
+ if (log.isDebugEnabled()) {
+ log.debug("Starting service pool: " + this);
+ }
}
protected void doStop() throws Exception {
- log.debug("Stopping service pool: " + this);
+ if (log.isDebugEnabled()) {
+ log.debug("Stopping service pool: " + this);
+ }
for (BlockingQueue<Service> entry : pool.values()) {
Collection<Service> values = new ArrayList<Service>();
entry.drainTo(values);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java?rev=889642&r1=889641&r2=889642&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java Fri Dec 11 14:46:15 2009
@@ -97,9 +97,7 @@
}
} else {
if (LOG.isDebugEnabled()) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Retrying attempt " + retryCounter + " to poll: " + this.getEndpoint());
- }
+ LOG.debug("Retrying attempt " + retryCounter + " to poll: " + this.getEndpoint());
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java?rev=889642&r1=889641&r2=889642&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java Fri Dec 11 14:46:15 2009
@@ -373,7 +373,9 @@
// also use a atomic boolean so its state is visible for the other threads
// this ensure that at most one thread is loading all the type converters
if (loaded.compareAndSet(false, true)) {
- LOG.debug("Loading type converters ...");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Loading type converters ...");
+ }
try {
for (TypeConverterLoader typeConverterLoader : typeConverterLoaders) {
typeConverterLoader.load(this);
@@ -388,7 +390,9 @@
} catch (Exception e) {
throw wrapRuntimeCamelException(e);
}
- LOG.debug("Loading type converters done");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Loading type converters done");
+ }
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java?rev=889642&r1=889641&r2=889642&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java Fri Dec 11 14:46:15 2009
@@ -106,7 +106,9 @@
// setting batch size to 0 or negative is like disabling it, so we set it as the max value
// as the code logic is dependent on a batch size having 1..n value
if (batchSize <= 0) {
- LOG.debug("Disabling batch size, will only be triggered by timeout");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Disabling batch size, will only be triggered by timeout");
+ }
this.batchSize = Integer.MAX_VALUE;
} else {
this.batchSize = batchSize;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java?rev=889642&r1=889641&r2=889642&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java Fri Dec 11 14:46:15 2009
@@ -134,7 +134,9 @@
try {
data.redeliveryDelay = data.currentRedeliveryPolicy.sleep(data.redeliveryDelay, data.redeliveryCounter);
} catch (InterruptedException e) {
- log.debug("Sleep interrupted, are we stopping? " + (isStopping() || isStopped()));
+ if (log.isDebugEnabled()) {
+ log.debug("Sleep interrupted, are we stopping? " + (isStopping() || isStopped()));
+ }
// continue from top
continue;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendAsyncProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendAsyncProcessor.java?rev=889642&r1=889641&r2=889642&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendAsyncProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendAsyncProcessor.java Fri Dec 11 14:46:15 2009
@@ -237,7 +237,9 @@
try {
exchange = completedTasks.poll(1000, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
- LOG.debug("Sleep interrupted, are we stopping? " + (isStopping() || isStopped()));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Sleep interrupted, are we stopping? " + (isStopping() || isStopped()));
+ }
continue;
}