This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 62e7f56 CAMEL-15430: fixes missing or incorrect log place holders
(#4142)
62e7f56 is described below
commit 62e7f564ee1f037524239400f8a2a6eae5ca4503
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Sat Aug 29 13:45:49 2020 +0200
CAMEL-15430: fixes missing or incorrect log place holders (#4142)
Include changes for:
* camel-ahc
* camel-jaxb
* camel-jetty
* camel-jms
* camel-jpa
* camel-pulsar
* camel-resteasy
* camel-sjms
* camel-telegram
* core/camel-xml-jaxp
---
.../main/java/org/apache/camel/component/ahc/AhcProducer.java | 2 +-
.../org/apache/camel/converter/jaxb/FallbackTypeConverter.java | 2 +-
.../org/apache/camel/component/jetty9/JettyContentExchange9.java | 4 ++--
.../src/main/java/org/apache/camel/component/jms/JmsBinding.java | 2 +-
.../camel/processor/idempotent/jpa/JpaMessageIdRepository.java | 8 ++++----
.../pulsar/utils/consumers/FailoverConsumerStrategy.java | 3 ++-
.../pulsar/utils/consumers/KeySharedConsumerStrategy.java | 3 ++-
.../component/pulsar/utils/consumers/SharedConsumerStrategy.java | 3 ++-
.../org/apache/camel/component/resteasy/ResteasyProducer.java | 2 +-
.../camel/component/resteasy/servlet/ResteasyCamelServlet.java | 6 +++---
.../java/org/apache/camel/component/sjms/jms/JmsBinding.java | 2 +-
.../telegram/service/TelegramServiceRestBotAPIAdapter.java | 2 +-
.../main/java/org/apache/camel/converter/jaxp/XmlConverter.java | 9 +++++----
.../org/apache/camel/support/builder/xml/XMLConverterHelper.java | 5 +++--
14 files changed, 29 insertions(+), 24 deletions(-)
diff --git
a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java
b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java
index 01c7e0f..15da32d 100644
---
a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java
+++
b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java
@@ -87,7 +87,7 @@ public class AhcProducer extends DefaultAsyncProducer {
@Override
public void onThrowable(Throwable t) {
if (LOG.isTraceEnabled()) {
- LOG.trace("{} onThrowable {}", exchange.getExchangeId(), t);
+ LOG.trace("{} onThrowable {}", exchange.getExchangeId(),
t.getMessage(), t);
}
try {
getEndpoint().getBinding().onThrowable(getEndpoint(),
exchange, t);
diff --git
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
index 5ba28e5..fc279dd 100644
---
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
+++
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
@@ -189,7 +189,7 @@ public class FallbackTypeConverter {
return castJaxbType(unmarshalled, type);
} catch (Exception ex) {
// There is some issue on the StaxStreamReader to
CXFPayload message body with different namespaces
- LOG.debug("Cannot use StaxStreamReader to unmarshal
the message, due to {}", ex);
+ LOG.debug("Cannot use StaxStreamReader to unmarshal
the message, due to {}", ex.getMessage(), ex);
}
}
}
diff --git
a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java
b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java
index a2990c4..2ca5924 100644
---
a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java
+++
b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java
@@ -112,7 +112,7 @@ public class JettyContentExchange9 implements
JettyContentExchange {
}
protected void onException(Throwable ex) {
- LOG.trace("onException {}", ex);
+ LOG.trace("onException {}", ex.getMessage(), ex);
// need to close the request input stream
closeRequestContentSource();
@@ -120,7 +120,7 @@ public class JettyContentExchange9 implements
JettyContentExchange {
}
protected void onConnectionFailed(Throwable ex) {
- LOG.trace("onConnectionFailed {}", ex);
+ LOG.trace("onConnectionFailed {}", ex.getMessage(), ex);
// need to close the request input stream
closeRequestContentSource();
diff --git
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
index dee3b01..1b9040f 100644
---
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
+++
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
@@ -338,7 +338,7 @@ public class JmsBinding {
if (answer == null) {
if (cause != null) {
// an exception occurred so send it as response
- LOG.debug("Will create JmsMessage with caused exception: {}",
cause);
+ LOG.debug("Will create JmsMessage with caused exception: {}",
cause.getMessage(), cause);
// create jms message containing the caused exception
answer = createJmsMessage(cause, session);
} else {
diff --git
a/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/JpaMessageIdRepository.java
b/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/JpaMessageIdRepository.java
index 8276923..c1156dc 100644
---
a/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/JpaMessageIdRepository.java
+++
b/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/JpaMessageIdRepository.java
@@ -116,7 +116,7 @@ public class JpaMessageIdRepository extends ServiceSupport
implements Idempotent
return Boolean.FALSE;
}
} catch (Exception ex) {
- LOG.error("Something went wrong trying to add message to
repository {}", ex);
+ LOG.error("Something went wrong trying to add message to
repository {}", ex.getMessage(), ex);
throw new PersistenceException(ex);
} finally {
try {
@@ -159,7 +159,7 @@ public class JpaMessageIdRepository extends ServiceSupport
implements Idempotent
return Boolean.TRUE;
}
} catch (Exception ex) {
- LOG.error("Something went wrong trying to check message in
repository {}", ex);
+ LOG.error("Something went wrong trying to check message in
repository {}", ex.getMessage(), ex);
throw new PersistenceException(ex);
} finally {
try {
@@ -205,7 +205,7 @@ public class JpaMessageIdRepository extends ServiceSupport
implements Idempotent
return Boolean.TRUE;
}
} catch (Exception ex) {
- LOG.error("Something went wrong trying to remove message
to repository {}", ex);
+ LOG.error("Something went wrong trying to remove message
to repository {}", ex.getMessage(), ex);
throw new PersistenceException(ex);
} finally {
try {
@@ -257,7 +257,7 @@ public class JpaMessageIdRepository extends ServiceSupport
implements Idempotent
}
return Boolean.TRUE;
} catch (Exception ex) {
- LOG.error("Something went wrong trying to clear the
repository {}", ex);
+ LOG.error("Something went wrong trying to clear the
repository {}", ex.getMessage(), ex);
throw new PersistenceException(ex);
} finally {
try {
diff --git
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/FailoverConsumerStrategy.java
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/FailoverConsumerStrategy.java
index 3aef0c3..b35da4d 100644
---
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/FailoverConsumerStrategy.java
+++
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/FailoverConsumerStrategy.java
@@ -56,7 +56,8 @@ public class FailoverConsumerStrategy implements
ConsumerCreationStrategy {
consumers.add(builder.subscriptionType(SubscriptionType.Failover).subscribe());
} catch (PulsarClientException exception) {
- LOGGER.error("A PulsarClientException occurred when creating
Consumer {}, {}", consumerName, exception);
+ LOGGER.error("A PulsarClientException occurred when creating
Consumer {}, {}", consumerName,
+ exception.getMessage(), exception);
}
}
return consumers;
diff --git
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/KeySharedConsumerStrategy.java
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/KeySharedConsumerStrategy.java
index 4df5fd2..b11bec3 100644
---
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/KeySharedConsumerStrategy.java
+++
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/KeySharedConsumerStrategy.java
@@ -56,7 +56,8 @@ public class KeySharedConsumerStrategy implements
ConsumerCreationStrategy {
consumers.add(builder.subscriptionType(SubscriptionType.Key_Shared).subscribe());
} catch (PulsarClientException exception) {
- LOGGER.error("A PulsarClientException occurred when creating
Consumer {}, {}", consumerName, exception);
+ LOGGER.error("A PulsarClientException occurred when creating
Consumer {}, {}", consumerName,
+ exception.getMessage(), exception);
}
}
return consumers;
diff --git
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/SharedConsumerStrategy.java
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/SharedConsumerStrategy.java
index 6d57e31..a10317c 100644
---
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/SharedConsumerStrategy.java
+++
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/SharedConsumerStrategy.java
@@ -56,7 +56,8 @@ public class SharedConsumerStrategy implements
ConsumerCreationStrategy {
consumers.add(builder.subscriptionType(SubscriptionType.Shared).subscribe());
} catch (PulsarClientException exception) {
- LOGGER.error("A PulsarClientException occurred when creating
Consumer {}, {}", consumerName, exception);
+ LOGGER.error("A PulsarClientException occurred when creating
Consumer {}, {}", consumerName,
+ exception.getMessage(), exception);
}
}
return consumers;
diff --git
a/components/camel-resteasy/src/main/java/org/apache/camel/component/resteasy/ResteasyProducer.java
b/components/camel-resteasy/src/main/java/org/apache/camel/component/resteasy/ResteasyProducer.java
index 2abf79b..ecc465a 100644
---
a/components/camel-resteasy/src/main/java/org/apache/camel/component/resteasy/ResteasyProducer.java
+++
b/components/camel-resteasy/src/main/java/org/apache/camel/component/resteasy/ResteasyProducer.java
@@ -212,7 +212,7 @@ public class ResteasyProducer extends DefaultProducer {
} catch (ClassNotFoundException | InvocationTargetException |
NoSuchMethodException | IllegalAccessException e) {
exchange.getMessage().getHeaders().put(ResteasyConstants.RESTEASY_PROXY_PRODUCER_EXCEPTION,
e);
exchange.getMessage().setBody(e);
- LOG.error("Camel Resteasy Proxy Client Exception: {}", e);
+ LOG.error("Camel Resteasy Proxy Client Exception: {}",
e.getMessage(), e);
}
return object;
}
diff --git
a/components/camel-resteasy/src/main/java/org/apache/camel/component/resteasy/servlet/ResteasyCamelServlet.java
b/components/camel-resteasy/src/main/java/org/apache/camel/component/resteasy/servlet/ResteasyCamelServlet.java
index 3d53475..14478f3 100644
---
a/components/camel-resteasy/src/main/java/org/apache/camel/component/resteasy/servlet/ResteasyCamelServlet.java
+++
b/components/camel-resteasy/src/main/java/org/apache/camel/component/resteasy/servlet/ResteasyCamelServlet.java
@@ -103,7 +103,7 @@ public class ResteasyCamelServlet extends
HttpServletDispatcher implements HttpR
// register new created proxy to the resteasy registry
getDispatcher().getRegistry().addSingletonResource(proxy);
} catch (ClassNotFoundException e) {
- LOG.error("Error initializing servlet: {}", e);
+ LOG.error("Error initializing servlet: {}",
e.getMessage(), e);
throw new ServletException(e);
}
}
@@ -273,10 +273,10 @@ public class ResteasyCamelServlet extends
HttpServletDispatcher implements HttpR
consumer.getBinding().writeResponse(exchange, httpServletResponse);
} catch (IOException e) {
- LOG.error("Error processing request: {}", e);
+ LOG.error("Error processing request: {}", e.getMessage(), e);
throw e;
} catch (Exception e) {
- LOG.error("Error processing request: {}", e);
+ LOG.error("Error processing request: {}", e.getMessage(), e);
throw new ServletException(e);
}
}
diff --git
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsBinding.java
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsBinding.java
index a25d19c..1fee671 100644
---
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsBinding.java
+++
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsBinding.java
@@ -278,7 +278,7 @@ public class JmsBinding {
if (answer == null) {
if (cause != null) {
// an exception occurred so send it as response
- LOG.debug("Will create JmsMessage with caused exception: {}",
cause);
+ LOG.debug("Will create JmsMessage with caused exception: {}",
cause.getMessage(), cause);
// create jms message containing the caused exception
answer = createJmsMessage(cause, session);
} else {
diff --git
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/TelegramServiceRestBotAPIAdapter.java
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/TelegramServiceRestBotAPIAdapter.java
index 35caee3a..6c39f01 100644
---
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/TelegramServiceRestBotAPIAdapter.java
+++
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/TelegramServiceRestBotAPIAdapter.java
@@ -402,7 +402,7 @@ public class TelegramServiceRestBotAPIAdapter implements
TelegramService {
@Override
public void onThrowable(Throwable t) {
if (LOG.isTraceEnabled()) {
- LOG.trace("{} onThrowable {}", exchange.getExchangeId(), t);
+ LOG.trace("{} onThrowable {}", exchange.getExchangeId(),
t.getMessage(), t);
}
exchange.setException(t);
callback.done(false);
diff --git
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index 5edde17..c8c09dc 100644
---
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -891,7 +891,8 @@ public class XmlConverter {
factory.setFeature(uri, value);
features.add("feature " + uri + " value " + value);
} catch (ParserConfigurationException e) {
- LOG.warn("DocumentBuilderFactory doesn't support the
feature {} with value {}, due to {}.", uri, value, e);
+ LOG.warn("DocumentBuilderFactory doesn't support the
feature {} with value {}, due to {}.", uri,
+ value, e.getMessage(), e);
}
}
}
@@ -932,14 +933,14 @@ public class XmlConverter {
factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
Boolean.TRUE);
} catch (ParserConfigurationException e) {
LOG.warn("DocumentBuilderFactory doesn't support the feature {}
with value {}, due to {}.",
- new Object[] { XMLConstants.FEATURE_SECURE_PROCESSING,
true, e });
+ XMLConstants.FEATURE_SECURE_PROCESSING, true,
e.getMessage(), e);
}
try {
// Disable the external-general-entities by default
factory.setFeature("http://xml.org/sax/features/external-general-entities";,
false);
} catch (ParserConfigurationException e) {
LOG.warn("DocumentBuilderFactory doesn't support the feature {}
with value {}, due to {}.",
- new Object[] {
"http://xml.org/sax/features/external-general-entities";, false, e });
+ "http://xml.org/sax/features/external-general-entities";,
false, e.getMessage(), e);
}
// setup the SecurityManager by default if it's apache xerces
try {
@@ -951,7 +952,7 @@ public class XmlConverter {
}
} catch (Exception e) {
LOG.warn("DocumentBuilderFactory doesn't support the attribute {},
due to {}.",
- new Object[] {
"http://apache.org/xml/properties/security-manager";, e });
+ "http://apache.org/xml/properties/security-manager";,
e.getMessage(), e);
}
// setup the feature from the system property
setupFeatures(factory);
diff --git
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
index 1320473..d9d0fda 100644
---
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
+++
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
@@ -177,7 +177,7 @@ public class XMLConverterHelper {
factory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true);
} catch (TransformerConfigurationException e) {
LOG.warn("TransformerFactory doesn't support the feature {} with
value {}, due to {}.",
- javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, "true",
e);
+ javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, "true",
e.getMessage(), e);
}
factory.setErrorListener(new XmlErrorListener());
configureSaxonTransformerFactory(factory);
@@ -255,7 +255,8 @@ public class XMLConverterHelper {
factory.setFeature(uri, value);
features.add("feature " + uri + " value " + value);
} catch (ParserConfigurationException e) {
- LOG.warn("DocumentBuilderFactory doesn't support the
feature {} with value {}, due to {}.", uri, value, e);
+ LOG.warn("DocumentBuilderFactory doesn't support the
feature {} with value {}, due to {}.", uri,
+ value, e.getMessage(), e);
}
}
}
