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 38ba0ee (chores) cross component logging fixes (#4832)
38ba0ee is described below
commit 38ba0ee0910a34406267bb02372d44792034f4c3
Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com>
AuthorDate: Wed Jan 6 06:46:14 2021 +0100
(chores) cross component logging fixes (#4832)
Adjust logging code to use log markers instead of concatenating strings
---
.../apache/camel/catalog/maven/DefaultMavenArtifactProvider.java | 7 +++----
.../java/org/apache/camel/catalog/maven/MavenVersionManager.java | 6 +++---
.../apache/camel/language/csimple/joor/JoorCSimpleCompiler.java | 2 +-
.../main/java/org/apache/camel/language/joor/JoorCompiler.java | 2 +-
.../cluster/lock/impl/ConfigMapLeaseResourceManager.java | 4 ++--
.../org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java | 9 ++++-----
.../main/java/org/apache/camel/swagger/RestSwaggerProcessor.java | 2 +-
.../java/org/apache/camel/management/DefaultManagementAgent.java | 6 +++---
.../org/apache/camel/converter/stream/FileInputStreamCache.java | 5 ++---
9 files changed, 20 insertions(+), 23 deletions(-)
diff --git
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
index c9c9f5d..1d912d0 100644
---
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
+++
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
@@ -89,7 +89,7 @@ public class DefaultMavenArtifactProvider implements
MavenArtifactProvider {
param.put("transitive", false);
if (log) {
- LOG.info("Downloading " + groupId + ":" + artifactId + ":"
+ version);
+ LOG.info("Downloading {}:{}:{}", groupId, artifactId,
version);
}
Grape.grab(param);
@@ -101,9 +101,8 @@ public class DefaultMavenArtifactProvider implements
MavenArtifactProvider {
} catch (Exception e) {
if (log) {
- LOG.warn("Error during add components from artifact " +
groupId + ":" + artifactId + ":"
- + version + " due " + e.getMessage(),
- e);
+ LOG.warn("Error during add components from artifact {}:{}:{}
due {}", groupId, artifactId, version,
+ e.getMessage(), e);
}
}
diff --git
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
index 5cfefa7..f403e7e 100644
---
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
+++
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
@@ -116,7 +116,7 @@ public class MavenVersionManager implements VersionManager,
Closeable {
return true;
} catch (Exception e) {
if (log) {
- LOG.warn("Cannot load version " + version + " due " +
e.getMessage(), e);
+ LOG.warn("Cannot load version {} due {}", version,
e.getMessage(), e);
}
return false;
}
@@ -146,7 +146,7 @@ public class MavenVersionManager implements VersionManager,
Closeable {
return true;
} catch (Exception e) {
if (log) {
- LOG.warn("Cannot load runtime provider version " + version + "
due " + e.getMessage(), e);
+ LOG.warn("Cannot load runtime provider version {} due {}",
version, e.getMessage(), e);
}
return false;
}
@@ -192,7 +192,7 @@ public class MavenVersionManager implements VersionManager,
Closeable {
}
} catch (IOException e) {
if (log) {
- LOG.warn("Cannot open resource " + name + " and version " +
version + " due " + e.getMessage(), e);
+ LOG.warn("Cannot open resource {} and version {} due {}",
name, version, e.getMessage(), e);
}
}
diff --git
a/components/camel-csimple-joor/src/main/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompiler.java
b/components/camel-csimple-joor/src/main/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompiler.java
index d05b7ce..f9c2261 100644
---
a/components/camel-csimple-joor/src/main/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompiler.java
+++
b/components/camel-csimple-joor/src/main/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompiler.java
@@ -98,7 +98,7 @@ public class JoorCSimpleCompiler extends ServiceSupport
implements CSimpleCompil
}
try {
if (LOG.isDebugEnabled()) {
- LOG.debug("Compiling code:\n\n" + code.getCode() + "\n");
+ LOG.debug("Compiling code:\n\n{}\n", code.getCode());
}
Reflect ref = Reflect.compile(code.getFqn(), code.getCode());
Class<?> clazz = ref.type();
diff --git
a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorCompiler.java
b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorCompiler.java
index e68d196..dea9f88 100644
---
a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorCompiler.java
+++
b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorCompiler.java
@@ -91,7 +91,7 @@ public class JoorCompiler extends ServiceSupport implements
StaticService {
String code = evalCode(camelContext, className, script, singleQuotes);
try {
if (LOG.isDebugEnabled()) {
- LOG.debug("Compiling code:\n\n" + code + "\n");
+ LOG.debug("Compiling code:\n\n{}\n", code);
}
Reflect ref = Reflect.compile(className, code);
Class<?> clazz = ref.type();
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/ConfigMapLeaseResourceManager.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/ConfigMapLeaseResourceManager.java
index 66e6b2e..cf80627 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/ConfigMapLeaseResourceManager.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/ConfigMapLeaseResourceManager.java
@@ -111,7 +111,7 @@ public class ConfigMapLeaseResourceManager implements
KubernetesLeaseResourceMan
try {
return new SimpleDateFormat(DATE_TIME_FORMAT).parse(timestamp);
} catch (Exception e) {
- LOG.warn("Unable to parse time string '" + timestamp + "' using
format " + DATE_TIME_FORMAT, e);
+ LOG.warn("Unable to parse time string '{}' using format {}",
timestamp, DATE_TIME_FORMAT, e);
}
return null;
@@ -135,7 +135,7 @@ public class ConfigMapLeaseResourceManager implements
KubernetesLeaseResourceMan
try {
return new SimpleDateFormat(DATE_TIME_FORMAT).format(date);
} catch (Exception e) {
- LOG.warn("Unable to format date '" + date + "' using format " +
DATE_TIME_FORMAT, e);
+ LOG.warn("Unable to format date '{}' using format {}", date,
DATE_TIME_FORMAT, e);
}
return null;
diff --git
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
index b8c7e95..dccf643 100644
---
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
+++
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java
@@ -380,7 +380,7 @@ public class SjmsBatchConsumer extends DefaultConsumer {
if (LOG.isDebugEnabled()) {
LOG.debug("Exception caught closing consumer", ex2);
}
- LOG.warn("Exception caught closing consumer for : {}. This
exception is ignored.", destinationName,
+ LOG.warn("Exception caught closing consumer for {}: {}. This
exception is ignored.", destinationName,
ex2.getMessage());
}
}
@@ -481,9 +481,8 @@ public class SjmsBatchConsumer extends DefaultConsumer {
reset();
}
} catch (Exception e) {
- LOG.warn("Error during evaluation of
completion predicate " + e.getMessage()
- + ". This exception is ignored.",
- e);
+ LOG.warn("Error during evaluation of
completion predicate {}. This exception is ignored.",
+ e.getMessage(), e);
}
}
}
@@ -579,7 +578,7 @@ public class SjmsBatchConsumer extends DefaultConsumer {
int batchSize = exchange.getProperty(Exchange.BATCH_SIZE,
Integer.class);
if (LOG.isDebugEnabled()) {
long total = MESSAGE_RECEIVED.get() + batchSize;
- LOG.debug("Processing batch[" + id + "]:size=" + batchSize +
":total=" + total);
+ LOG.debug("Processing batch[{}]:size={}:total={}", id,
batchSize, total);
}
if ("timeout".equals(completedBy)) {
diff --git
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerProcessor.java
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerProcessor.java
index fec636e..1763c9a 100644
---
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerProcessor.java
+++
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerProcessor.java
@@ -122,7 +122,7 @@ public class RestSwaggerProcessor implements Processor {
}
}
} catch (Exception e) {
- LOG.warn("Error rendering Swagger API due " + e.getMessage(), e);
+ LOG.warn("Error rendering Swagger API due {}", e.getMessage(), e);
}
}
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
index fb3c4c4..d75582d 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
@@ -391,9 +391,9 @@ public class DefaultManagementAgent extends ServiceSupport
implements Management
}
}
if (caught > 0) {
- LOG.warn("A number of " + caught
- + " exceptions caught while unregistering MBeans during
stop operation."
- + " See INFO log for details.");
+ LOG.warn("A number of {} exceptions caught while unregistering
MBeans during stop operation. See INFO log"
+ + "for details.",
+ caught);
}
ServiceHelper.stopService(assembler);
diff --git
a/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
b/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
index a23d984..2aefc36 100644
---
a/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
+++
b/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
@@ -216,9 +216,8 @@ public final class FileInputStreamCache extends InputStream
implements StreamCac
try {
cleanUpTempFile();
} catch (Exception e) {
- LOG.warn("Error deleting temporary cache file:
" + tempFile
- + ". This exception will be ignored.",
- e);
+ LOG.warn("Error deleting temporary cache file:
{}. This exception will be ignored.",
+ tempFile, e);
}
}
}
