Updated Branches: refs/heads/camel-2.11.x 39a4b2864 -> 9f145e16e refs/heads/camel-2.12.x aaec68267 -> 8fe198d01 refs/heads/master 06e4d6223 -> 5d5b7e71d
CAMEL-6961: Removed not needed WARN logs. Polished WARN logs a bit. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0f3115a0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0f3115a0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0f3115a0 Branch: refs/heads/master Commit: 0f3115a04f90d0a918b59c6b93e295e5e6e21a75 Parents: 06e4d62 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Nov 14 14:44:45 2013 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Nov 14 14:44:45 2013 +0100 ---------------------------------------------------------------------- .../apache/camel/component/direct/DirectBlockingProducer.java | 1 - .../java/org/apache/camel/component/direct/DirectProducer.java | 5 ----- .../camel/component/directvm/DirectVmBlockingProducer.java | 1 - .../org/apache/camel/component/directvm/DirectVmProducer.java | 5 ----- .../main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java | 2 +- .../java/org/apache/camel/impl/DefaultInflightRepository.java | 2 +- .../main/java/org/apache/camel/impl/UriEndpointComponent.java | 3 +-- 7 files changed, 3 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0f3115a0/camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java b/camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java index 494ba03..76e98bc 100644 --- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java +++ b/camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java @@ -64,7 +64,6 @@ public class DirectBlockingProducer extends DefaultAsyncProducer { // okay then await until we have a consumer or we timed out answer = awaitConsumer(); if (answer == null) { - LOG.warn("No consumers available on endpoint: " + endpoint + " to process: " + exchange); throw new DirectConsumerNotAvailableException("No consumers available on endpoint: " + endpoint, exchange); } } http://git-wip-us.apache.org/repos/asf/camel/blob/0f3115a0/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java b/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java index 8558bcd..8a60d30 100644 --- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java +++ b/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java @@ -19,8 +19,6 @@ package org.apache.camel.component.direct; import org.apache.camel.AsyncCallback; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultAsyncProducer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * The direct producer. @@ -28,7 +26,6 @@ import org.slf4j.LoggerFactory; * @version */ public class DirectProducer extends DefaultAsyncProducer { - private static final Logger LOG = LoggerFactory.getLogger(DirectProducer.class); private final DirectEndpoint endpoint; public DirectProducer(DirectEndpoint endpoint) { @@ -38,7 +35,6 @@ public class DirectProducer extends DefaultAsyncProducer { public void process(Exchange exchange) throws Exception { if (endpoint.getConsumer() == null) { - LOG.warn("No consumers available on endpoint: " + endpoint + " to process: " + exchange); throw new DirectConsumerNotAvailableException("No consumers available on endpoint: " + endpoint, exchange); } else { endpoint.getConsumer().getProcessor().process(exchange); @@ -47,7 +43,6 @@ public class DirectProducer extends DefaultAsyncProducer { public boolean process(Exchange exchange, AsyncCallback callback) { if (endpoint.getConsumer() == null) { - LOG.warn("No consumers available on endpoint: " + endpoint + " to process: " + exchange); // indicate its done synchronously exchange.setException(new DirectConsumerNotAvailableException("No consumers available on endpoint: " + endpoint, exchange)); callback.done(true); http://git-wip-us.apache.org/repos/asf/camel/blob/0f3115a0/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmBlockingProducer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmBlockingProducer.java b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmBlockingProducer.java index 304d714..22d3f63 100644 --- a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmBlockingProducer.java +++ b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmBlockingProducer.java @@ -64,7 +64,6 @@ public class DirectVmBlockingProducer extends DefaultAsyncProducer { // okay then await until we have a consumer or we timed out answer = awaitConsumer(); if (answer == null) { - LOG.warn("No consumers available on endpoint: " + endpoint + " to process: " + exchange); throw new DirectVmConsumerNotAvailableException("No consumers available on endpoint: " + endpoint, exchange); } } http://git-wip-us.apache.org/repos/asf/camel/blob/0f3115a0/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProducer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProducer.java b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProducer.java index 0e1ba2c..14a2138 100644 --- a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProducer.java +++ b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProducer.java @@ -19,15 +19,12 @@ package org.apache.camel.component.directvm; import org.apache.camel.AsyncCallback; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultAsyncProducer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * The direct-vm producer */ public class DirectVmProducer extends DefaultAsyncProducer { - private static final Logger LOG = LoggerFactory.getLogger(DirectVmProducer.class); private DirectVmEndpoint endpoint; public DirectVmProducer(DirectVmEndpoint endpoint) { @@ -40,7 +37,6 @@ public class DirectVmProducer extends DefaultAsyncProducer { // send to consumer DirectVmConsumer consumer = endpoint.getComponent().getConsumer(endpoint); if (consumer == null) { - LOG.warn("No consumers available on endpoint: " + endpoint + " to process: " + exchange); throw new DirectVmConsumerNotAvailableException("No consumers available on endpoint: " + endpoint, exchange); } else { consumer.getProcessor().process(exchange); @@ -52,7 +48,6 @@ public class DirectVmProducer extends DefaultAsyncProducer { // send to consumer DirectVmConsumer consumer = endpoint.getComponent().getConsumer(endpoint); if (consumer == null) { - LOG.warn("No consumers available on endpoint: " + endpoint + " to process: " + exchange); exchange.setException(new DirectVmConsumerNotAvailableException("No consumers available on endpoint: " + endpoint, exchange)); callback.done(true); return true; http://git-wip-us.apache.org/repos/asf/camel/blob/0f3115a0/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java b/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java index 2020714..16ef3d6 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java +++ b/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java @@ -86,7 +86,7 @@ public class ActiveMQUuidGenerator implements UuidGenerator { if (LOG.isTraceEnabled()) { LOG.trace("Closing the server socket failed", ioe); } else { - LOG.warn("Closing the server socket failed" + " due " + ioe.getMessage()); + LOG.warn("Closing the server socket failed due " + ioe.getMessage() + ". This exception is ignored."); } } } http://git-wip-us.apache.org/repos/asf/camel/blob/0f3115a0/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java index 64dcddd..4408fde 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java @@ -88,7 +88,7 @@ public class DefaultInflightRepository extends ServiceSupport implements Infligh protected void doStop() throws Exception { int count = size(); if (count > 0) { - LOG.warn("Shutting down while there are still " + count + " in flight exchanges."); + LOG.warn("Shutting down while there are still " + count + " inflight exchanges."); } else { LOG.debug("Shutting down with no inflight exchanges."); } http://git-wip-us.apache.org/repos/asf/camel/blob/0f3115a0/camel-core/src/main/java/org/apache/camel/impl/UriEndpointComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/UriEndpointComponent.java b/camel-core/src/main/java/org/apache/camel/impl/UriEndpointComponent.java index fa9dba0..a034e52 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/UriEndpointComponent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/UriEndpointComponent.java @@ -92,8 +92,7 @@ public abstract class UriEndpointComponent extends DefaultComponent { populateParameterConfigurationMap(parameterMap, fieldType, nestedPrefix); } else { if (parameterMap.containsKey(propertyName)) { - LOG.warn( - "Duplicate property name " + propertyName + " defined on field " + field); + LOG.warn("Duplicate property name " + propertyName + " defined on field " + field); } else { parameterMap.put(propertyName, ParameterConfiguration.newInstance(propertyName, field, uriParam));
