This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new a4639655102 (chores) camel-core: use log markers for logging (#11042)
a4639655102 is described below
commit a46396551022a973c049c752fc305c6556655e4b
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Tue Aug 8 15:00:56 2023 +0200
(chores) camel-core: use log markers for logging (#11042)
---
.../org/apache/camel/impl/engine/CamelInternalProcessor.java | 8 +++-----
.../camel/impl/engine/DefaultAsyncProcessorAwaitManager.java | 4 ++--
.../camel/impl/engine/DefaultPackageScanResourceResolver.java | 2 +-
.../org/apache/camel/impl/engine/DefaultShutdownStrategy.java | 8 ++++----
.../src/main/docs/modules/eips/pages/split-eip.adoc | 8 ++++----
.../java/org/apache/camel/processor/MulticastProcessor.java | 2 +-
.../src/main/java/org/apache/camel/processor/Resequencer.java | 2 +-
.../java/org/apache/camel/processor/SendDynamicProcessor.java | 7 +++----
.../src/main/java/org/apache/camel/main/MainHelper.java | 5 ++---
.../src/main/java/org/apache/camel/main/MainSupport.java | 2 +-
.../camel/management/JmxManagementLifecycleStrategy.java | 10 +++++-----
.../issues/DynamicRouterConvertBodyToIssueManualTest.java | 6 +++---
.../camel/management/JmxNotificationEventNotifierTest.java | 2 +-
.../ReduceStacksNeededDuringRoutingSendProcessorTest.java | 2 +-
.../camel/processor/ReduceStacksNeededDuringRoutingTest.java | 2 +-
.../org/apache/camel/support/DefaultContextReloadStrategy.java | 2 +-
.../src/main/java/org/apache/camel/support/EventHelper.java | 2 +-
.../camel/support/FileWatcherResourceReloadStrategy.java | 5 ++---
.../org/apache/camel/support/RouteOnDemandReloadStrategy.java | 4 +---
.../java/org/apache/camel/support/RouteTemplateHelper.java | 4 +---
.../camel/support/cluster/RebalancingCamelClusterService.java | 6 +++---
.../src/main/java/org/apache/camel/util/IOHelper.java | 8 ++++----
22 files changed, 46 insertions(+), 55 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
index 8c4291246af..79229d7fbd6 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
@@ -508,8 +508,7 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor implements In
policy.onExchangeBegin(route, exchange);
}
} catch (Exception e) {
- log.warn("Error occurred during onExchangeBegin on
RoutePolicy: " + policy
- + ". This exception will be ignored",
+ log.warn("Error occurred during onExchangeBegin on
RoutePolicy: {}. This exception will be ignored", policy,
e);
}
}
@@ -530,9 +529,8 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor implements In
policy.onExchangeDone(route, exchange);
}
} catch (Exception e) {
- log.warn("Error occurred during onExchangeDone on
RoutePolicy: " + policy
- + ". This exception will be ignored",
- e);
+ log.warn("Error occurred during onExchangeDone on
RoutePolicy: {}. This exception will be ignored",
+ policy, e);
}
}
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java
index 0acfe260d03..c62abeb7551 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java
@@ -237,8 +237,8 @@ public class DefaultAsyncProcessorAwaitManager extends
ServiceSupport implements
try {
interrupt(entry.getExchange());
} catch (Throwable e) {
- LOG.warn("Error while interrupting thread: " +
entry.getBlockedThread().getName()
- + ". This exception is ignored.",
+ LOG.warn("Error while interrupting thread: {}. This
exception is ignored.",
+ entry.getBlockedThread().getName(),
e);
}
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java
index 14107a437f1..c88dda352c7 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java
@@ -238,7 +238,7 @@ public class DefaultPackageScanResourceResolver extends
BasePackageScanResolver
}
} catch (IOException ioe) {
- LOG.warn("Cannot search jar file '" + urlPath + " due to an
IOException: " + ioe.getMessage(), ioe);
+ LOG.warn("Cannot search jar file '{} due to an IOException: {}",
urlPath, ioe.getMessage(), ioe);
} finally {
IOHelper.close(jarStream, urlPath, LOG);
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
index 1f5c7438d7e..beeb97e159c 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
@@ -432,7 +432,7 @@ public class DefaultShutdownStrategy extends ServiceSupport
implements ShutdownS
try {
ServiceHelper.stopService(consumer);
} catch (Throwable e) {
- LOG.warn("Error occurred while shutting down route: " + routeId +
". This exception will be ignored.", e);
+ LOG.warn("Error occurred while shutting down route: {}. This
exception will be ignored.", routeId, e);
// fire event
EventHelper.notifyServiceStopFailure(consumer.getEndpoint().getCamelContext(),
consumer, e);
}
@@ -453,7 +453,7 @@ public class DefaultShutdownStrategy extends ServiceSupport
implements ShutdownS
try {
ServiceHelper.suspendService(consumer);
} catch (Throwable e) {
- LOG.warn("Error occurred while suspending route: " + routeId + ".
This exception will be ignored.", e);
+ LOG.warn("Error occurred while suspending route: {}. This
exception will be ignored.", routeId, e);
// fire event
EventHelper.notifyServiceStopFailure(consumer.getEndpoint().getCamelContext(),
consumer, e);
}
@@ -518,9 +518,9 @@ public class DefaultShutdownStrategy extends ServiceSupport
implements ShutdownS
((ShutdownPrepared) child).prepareShutdown(suspendOnly,
forced);
} catch (Exception e) {
if (suppressLogging) {
- LOG.trace("Error during prepare shutdown on " + child
+ ". This exception will be ignored.", e);
+ LOG.trace("Error during prepare shutdown on {}. This
exception will be ignored.", child, e);
} else {
- LOG.warn("Error during prepare shutdown on " + child +
". This exception will be ignored.", e);
+ LOG.warn("Error during prepare shutdown on {}. This
exception will be ignored.", child, e);
}
}
}
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/split-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/split-eip.adoc
index 2c02c1560c8..d5c4a26a507 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/split-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/split-eip.adoc
@@ -680,7 +680,7 @@ public static class MyOrderService {
* We just handle the order by returning an id line for the order
*/
public String handleOrder(String line) {
- LOG.debug("HandleOrder: " + line);
+ LOG.debug("HandleOrder: {}", line);
return "(id=" + ++counter + ",item=" + line + ")";
}
@@ -689,7 +689,7 @@ public static class MyOrderService {
* back to the original caller
*/
public String buildCombinedResponse(String line) {
- LOG.debug("BuildCombinedResponse: " + line);
+ LOG.debug("BuildCombinedResponse: {}", line);
return "Response[" + line + "]";
}
}
@@ -721,8 +721,8 @@ public static class MyOrderStrategy implements
AggregationStrategy {
String orders = oldExchange.getIn().getBody(String.class);
String newLine = newExchange.getIn().getBody(String.class);
- LOG.debug("Aggregate old orders: " + orders);
- LOG.debug("Aggregate new order: " + newLine);
+ LOG.debug("Aggregate old orders: {}", orders);
+ LOG.debug("Aggregate new order: {}", newLine);
// put orders together separating by semicolon
orders = orders + ";" + newLine;
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
index e86b46591ab..7c967d985a8 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
@@ -850,7 +850,7 @@ public class MulticastProcessor extends
AsyncProcessorSupport
processorExchangeFactory.release(pair.getExchange());
}
} catch (Throwable e) {
- LOG.warn("Error releasing exchange due to " + e.getMessage() +
". This exception is ignored.", e);
+ LOG.warn("Error releasing exchange due to {}. This exception
is ignored.", e.getMessage(), e);
}
}
// we are done so close the pairs iterator
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Resequencer.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Resequencer.java
index 0bcf9e215ad..355fc7705d3 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Resequencer.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Resequencer.java
@@ -395,7 +395,7 @@ public class Resequencer extends AsyncProcessorSupport
implements Navigate<Proce
try {
result = expression.evaluate(exchange, Object.class);
} catch (Exception e) {
- LOG.debug("Error evaluating expression: " + expression + ". This
exception is ignored.", e);
+ LOG.debug("Error evaluating expression: {}. This exception is
ignored.", expression, e);
}
return result != null;
}
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java
index 7dff61b5990..2734a08be19 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java
@@ -163,7 +163,7 @@ public class SendDynamicProcessor extends
AsyncProcessorSupport implements IdAwa
} catch (Throwable e) {
if (isIgnoreInvalidEndpoint()) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Endpoint uri is invalid: " + recipient + ".
This exception will be ignored.", e);
+ LOG.debug("Endpoint uri is invalid: {}. This exception
will be ignored.", recipient, e);
}
} else {
exchange.setException(e);
@@ -342,9 +342,8 @@ public class SendDynamicProcessor extends
AsyncProcessorSupport implements IdAwa
} catch (Throwable e) {
// ignore
if (LOG.isDebugEnabled()) {
- LOG.debug("Error creating optimised
SendDynamicAwareResolver for uri: " + URISupport.sanitizeUri(uri)
- + " due to " + e.getMessage() + ". This
exception is ignored",
- e);
+ LOG.debug("Error creating optimised
SendDynamicAwareResolver for uri: {} due to {}. This exception is ignored",
+ URISupport.sanitizeUri(uri), e.getMessage(), e);
}
}
}
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java
b/core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java
index a78a289c417..01b9cc08441 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java
@@ -351,9 +351,8 @@ public final class MainHelper {
throw new PropertyBindingException(
e.getTarget(), e.getPropertyName(), e.getValue(),
optionPrefix, key, e.getCause());
} else {
- LOG.debug("Error configuring property (" + key + ") with name:
" + e.getPropertyName() + ") on bean: " + target
- + " with value: " + e.getValue() + ". This exception
is ignored as failIfNotSet=false.",
- e);
+ LOG.debug("Error configuring property ({}) with name: {}) on
bean: {} with value: {}. This exception is ignored as failIfNotSet=false.",
+ key, e.getPropertyName(), target, e.getValue(), e);
}
}
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
index 45ba4fbb302..fb814007e9e 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
@@ -167,7 +167,7 @@ public abstract class MainSupport extends BaseMainSupport {
camelTemplate = null;
}
} catch (Exception e) {
- LOG.debug("Error stopping camelTemplate due " + e.getMessage() +
". This exception is ignored.", e);
+ LOG.debug("Error stopping camelTemplate due {}. This exception is
ignored.", e.getMessage(), e);
}
}
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementLifecycleStrategy.java
b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementLifecycleStrategy.java
index 6db96c7a03f..e8e01ef30a3 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementLifecycleStrategy.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementLifecycleStrategy.java
@@ -412,7 +412,7 @@ public class JmxManagementLifecycleStrategy extends
ServiceSupport implements Li
}
manageObject(me);
} catch (Exception e) {
- LOG.warn("Could not register Endpoint MBean for endpoint: " +
endpoint + ". This exception will be ignored.", e);
+ LOG.warn("Could not register Endpoint MBean for endpoint: {}. This
exception will be ignored.", endpoint, e);
}
}
@@ -427,7 +427,7 @@ public class JmxManagementLifecycleStrategy extends
ServiceSupport implements Li
Object me =
getManagementObjectStrategy().getManagedObjectForEndpoint(camelContext,
endpoint);
unmanageObject(me);
} catch (Exception e) {
- LOG.warn("Could not unregister Endpoint MBean for endpoint: " +
endpoint + ". This exception will be ignored.", e);
+ LOG.warn("Could not unregister Endpoint MBean for endpoint: {}.
This exception will be ignored.", endpoint, e);
}
}
@@ -462,7 +462,7 @@ public class JmxManagementLifecycleStrategy extends
ServiceSupport implements Li
try {
manageObject(managedObject);
} catch (Exception e) {
- LOG.warn("Could not register service: " + service + " as Service
MBean.", e);
+ LOG.warn("Could not register service: {} as Service MBean.",
service, e);
}
}
@@ -478,7 +478,7 @@ public class JmxManagementLifecycleStrategy extends
ServiceSupport implements Li
try {
unmanageObject(managedObject);
} catch (Exception e) {
- LOG.warn("Could not unregister service: " + service + " as
Service MBean.", e);
+ LOG.warn("Could not unregister service: {} as Service MBean.",
service, e);
}
}
}
@@ -716,7 +716,7 @@ public class JmxManagementLifecycleStrategy extends
ServiceSupport implements Li
// we need to keep track here, as we cannot re-construct the
thread pool ObjectName when removing the thread pool
managedThreadPools.put(threadPool, mtp);
} catch (Exception e) {
- LOG.warn("Could not register thread pool: " + threadPool + " as
ThreadPool MBean.", e);
+ LOG.warn("Could not register thread pool: {} as ThreadPool
MBean.", threadPool, e);
}
}
diff --git
a/core/camel-management/src/test/java/org/apache/camel/issues/DynamicRouterConvertBodyToIssueManualTest.java
b/core/camel-management/src/test/java/org/apache/camel/issues/DynamicRouterConvertBodyToIssueManualTest.java
index 299259f87fa..a6a2cfc42d8 100644
---
a/core/camel-management/src/test/java/org/apache/camel/issues/DynamicRouterConvertBodyToIssueManualTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/issues/DynamicRouterConvertBodyToIssueManualTest.java
@@ -63,7 +63,7 @@ public class DynamicRouterConvertBodyToIssueManualTest
extends ContextTestSuppor
@Override
public void process(Exchange exchange) throws Exception {
- log.info("Some: " + counter);
+ log.info("Some: {}", counter);
exchange.setProperty("EXIT", "NO");
StringBuilder sb = new StringBuilder();
@@ -80,9 +80,9 @@ public class DynamicRouterConvertBodyToIssueManualTest
extends ContextTestSuppor
}
public String slip(String body, @ExchangeProperties Map<String, Object>
properties) {
- log.info("slip " + properties.get("EXIT"));
+ log.info("slip {}", properties.get("EXIT"));
if (properties.get("EXIT") != null &&
properties.get("EXIT").equals("PLEASE")) {
- log.info("Exiting after " + MAX_ITERATIONS + " iterations");
+ log.info("Exiting after {} iterations", MAX_ITERATIONS);
return null;
} else {
return "direct:while_body";
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java
index 5d46399d52a..2bdd36a1807 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java
@@ -127,7 +127,7 @@ public class JmxNotificationEventNotifierTest extends
ManagementTestSupport {
@Override
public void handleNotification(Notification notification, Object
handback) {
- log.debug("Get the notification : " + notification);
+ log.debug("Get the notification : {}", notification);
eventCounter++;
}
diff --git
a/core/camel-management/src/test/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingSendProcessorTest.java
b/core/camel-management/src/test/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingSendProcessorTest.java
index a331f005d59..6093f667523 100644
---
a/core/camel-management/src/test/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingSendProcessorTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingSendProcessorTest.java
@@ -104,7 +104,7 @@ public class
ReduceStacksNeededDuringRoutingSendProcessorTest extends ContextTes
throw new IllegalArgumentException("Forced to dump
stacktrace");
} catch (Exception e) {
e.fillInStackTrace();
- LOG.info("There are " + e.getStackTrace().length + " lines in
the stacktrace");
+ LOG.info("There are {} lines in the stacktrace",
e.getStackTrace().length);
LOG.error("Dump stacktrace to log", e);
}
callback.done(true);
diff --git
a/core/camel-management/src/test/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingTest.java
b/core/camel-management/src/test/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingTest.java
index 931df6a433c..a12a63f0bdb 100644
---
a/core/camel-management/src/test/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingTest.java
@@ -54,7 +54,7 @@ public class ReduceStacksNeededDuringRoutingTest extends
ContextTestSupport {
throw new IllegalArgumentException("Forced to
dump stacktrace");
} catch (Exception e) {
e.fillInStackTrace();
- log.info("There are " +
e.getStackTrace().length + " lines in the stacktrace");
+ log.info("There are {} lines in the
stacktrace", e.getStackTrace().length);
log.error("Dump stacktrace to log", e);
}
})
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultContextReloadStrategy.java
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultContextReloadStrategy.java
index 17fa35702c6..068060ad069 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultContextReloadStrategy.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultContextReloadStrategy.java
@@ -64,7 +64,7 @@ public class DefaultContextReloadStrategy extends
ServiceSupport implements Cont
EventHelper.notifyContextReloaded(getCamelContext(), source);
} catch (Exception e) {
incFailedCounter();
- LOG.warn("Error reloading CamelContext (" + camelContext.getName()
+ ") due to: " + e.getMessage(), e);
+ LOG.warn("Error reloading CamelContext ({}) due to: {}",
camelContext.getName(), e.getMessage(), e);
EventHelper.notifyContextReloadFailure(getCamelContext(), source,
e);
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
index 317d2afd4ff..8fe24cf07bf 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
@@ -1512,7 +1512,7 @@ public final class EventHelper {
try {
notifier.notify(event);
} catch (Throwable e) {
- LOG.warn("Error notifying event " + event + ". This exception will
be ignored.", e);
+ LOG.warn("Error notifying event {}. This exception will be
ignored.", event, e);
}
return true;
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/FileWatcherResourceReloadStrategy.java
b/core/camel-support/src/main/java/org/apache/camel/support/FileWatcherResourceReloadStrategy.java
index 4a588c29ee5..93da2e0f734 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/FileWatcherResourceReloadStrategy.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/FileWatcherResourceReloadStrategy.java
@@ -305,9 +305,8 @@ public class FileWatcherResourceReloadStrategy extends
ResourceReloadStrategySup
incSucceededCounter();
} catch (Exception e) {
incFailedCounter();
- LOG.warn("Error reloading routes from file: "
+ name + " due " + e.getMessage()
- + ". This exception is ignored.",
- e);
+ LOG.warn("Error reloading routes from file: {}
due to {}. This exception is ignored.", name,
+ e.getMessage(), e);
}
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/RouteOnDemandReloadStrategy.java
b/core/camel-support/src/main/java/org/apache/camel/support/RouteOnDemandReloadStrategy.java
index fd71e22782f..552b9a64760 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/RouteOnDemandReloadStrategy.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/RouteOnDemandReloadStrategy.java
@@ -75,9 +75,7 @@ public class RouteOnDemandReloadStrategy extends
RouteWatcherReloadStrategy {
incSucceededCounter();
} catch (Exception e) {
incFailedCounter();
- LOG.warn("Error reloading routes due " + e.getMessage()
- + ". This exception is ignored.",
- e);
+ LOG.warn("Error reloading routes due to {}. This exception is
ignored.", e.getMessage(), e);
} finally {
if (cl != null) {
Thread.currentThread().setContextClassLoader(cl);
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/RouteTemplateHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/RouteTemplateHelper.java
index 2d9561f815a..0f8c8cfb052 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/RouteTemplateHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/RouteTemplateHelper.java
@@ -82,9 +82,7 @@ public final class RouteTemplateHelper {
listener.loadRouteTemplate(res);
}
} catch (Exception e) {
- LOG.warn("RouteTemplateLoaderListener error due to " +
e.getMessage()
- + ". This exception is ignored",
- e);
+ LOG.warn("RouteTemplateLoaderListener error due to {}.
This exception is ignored", e.getMessage(), e);
}
PluginHelper.getRoutesLoader(camelContext).loadRoutes(res);
found = true;
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/cluster/RebalancingCamelClusterService.java
b/core/camel-support/src/main/java/org/apache/camel/support/cluster/RebalancingCamelClusterService.java
index 8414c7215ff..112b149f1c4 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/cluster/RebalancingCamelClusterService.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/cluster/RebalancingCamelClusterService.java
@@ -163,7 +163,7 @@ public class RebalancingCamelClusterService implements
CamelPreemptiveClusterSer
view.setDisabled(disabled);
}
} catch (Exception ex) {
- LOG.warn("Could not get view " + partition, ex);
+ LOG.warn("Could not get view {}", partition, ex);
}
}
@@ -176,7 +176,7 @@ public class RebalancingCamelClusterService implements
CamelPreemptiveClusterSer
owned.add(partition);
}
} catch (Exception ex) {
- LOG.warn("Could not get view " + partition, ex);
+ LOG.warn("Could not get view {}", partition, ex);
return null;
}
}
@@ -201,7 +201,7 @@ public class RebalancingCamelClusterService implements
CamelPreemptiveClusterSer
}
members = viewMembers;
} catch (Exception ex) {
- LOG.warn("Could not get view " + group, ex);
+ LOG.warn("Could not get view {}", group, ex);
return null;
}
}
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
b/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
index 1b61ee984e5..d0c76c2e08b 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
@@ -276,7 +276,7 @@ public final class IOHelper {
log = LOG;
}
if (name != null) {
- log.warn("Cannot force FileChannel: " + name + ". Reason: " +
e.getMessage(), e);
+ log.warn("Cannot force FileChannel: {}. Reason: {}", name,
e.getMessage(), e);
} else {
log.warn("Cannot force FileChannel. Reason: {}",
e.getMessage(), e);
}
@@ -302,7 +302,7 @@ public final class IOHelper {
log = LOG;
}
if (name != null) {
- log.warn("Cannot sync FileDescriptor: " + name + ". Reason: "
+ e.getMessage(), e);
+ log.warn("Cannot sync FileDescriptor: {}. Reason: {}", name,
e.getMessage(), e);
} else {
log.warn("Cannot sync FileDescriptor. Reason: {}",
e.getMessage(), e);
}
@@ -331,7 +331,7 @@ public final class IOHelper {
log = LOG;
}
if (name != null) {
- log.warn("Cannot flush Writer: " + name + ". Reason: " +
e.getMessage(), e);
+ log.warn("Cannot flush Writer: {}. Reason: {}", name,
e.getMessage(), e);
} else {
log.warn("Cannot flush Writer. Reason: {}",
e.getMessage(), e);
}
@@ -359,7 +359,7 @@ public final class IOHelper {
log = LOG;
}
if (name != null) {
- log.warn("Cannot close: " + name + ". Reason: " +
e.getMessage(), e);
+ log.warn("Cannot close: {}. Reason: {}", name,
e.getMessage(), e);
} else {
log.warn("Cannot close. Reason: {}", e.getMessage(), e);
}
