You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2017/04/03 08:02:23 UTC

camel git commit: CAMEL-11019 Customise message history dump format

Repository: camel
Updated Branches:
  refs/heads/master 6585c2a07 -> fe57a498f


CAMEL-11019 Customise message history dump format


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fe57a498
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fe57a498
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fe57a498

Branch: refs/heads/master
Commit: fe57a498f6a5305b2d9a06999c8ca9c3c6c12d16
Parents: 6585c2a
Author: onders86 <on...@gmail.com>
Authored: Fri Mar 31 14:27:25 2017 +0300
Committer: Zoran Regvart <zr...@apache.org>
Committed: Mon Apr 3 10:02:07 2017 +0200

----------------------------------------------------------------------
 camel-core/src/main/java/org/apache/camel/Exchange.java   |  2 ++
 .../main/java/org/apache/camel/util/MessageHelper.java    | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/fe57a498/camel-core/src/main/java/org/apache/camel/Exchange.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/Exchange.java b/camel-core/src/main/java/org/apache/camel/Exchange.java
index a736174..3e22c78 100644
--- a/camel-core/src/main/java/org/apache/camel/Exchange.java
+++ b/camel-core/src/main/java/org/apache/camel/Exchange.java
@@ -169,6 +169,8 @@ public interface Exchange {
     String MAXIMUM_TRANSFORMER_CACHE_SIZE = "CamelMaximumTransformerCacheSize";
     String MAXIMUM_VALIDATOR_CACHE_SIZE = "CamelMaximumValidatorCacheSize";
     String MESSAGE_HISTORY             = "CamelMessageHistory";
+    String MESSAGE_HISTORY_HEADER_FORMAT      = "CamelMessageHistoryHeaderFormat";
+    String MESSAGE_HISTORY_OUTPUT_FORMAT      = "CamelMessageHistoryOutputFormat";
     String MULTICAST_INDEX             = "CamelMulticastIndex";
     String MULTICAST_COMPLETE          = "CamelMulticastComplete";
 

http://git-wip-us.apache.org/repos/asf/camel/blob/fe57a498/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
index 4e9de42..4b34902 100644
--- a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
@@ -546,7 +546,10 @@ public final class MessageHelper {
         sb.append("\n");
         sb.append("Message History\n");
         sb.append("---------------------------------------------------------------------------------------------------------------------------------------\n");
-        sb.append(String.format(MESSAGE_HISTORY_HEADER, "RouteId", "ProcessorId", "Processor", "Elapsed (ms)"));
+        String goMessageHistoryHeaeder = exchange.getContext().getGlobalOption(Exchange.MESSAGE_HISTORY_HEADER_FORMAT);
+        sb.append(String.format(
+                         goMessageHistoryHeaeder == null ? MESSAGE_HISTORY_HEADER : goMessageHistoryHeaeder,
+                         "RouteId", "ProcessorId", "Processor", "Elapsed (ms)"));
         sb.append("\n");
 
         // add incoming origin of message on the top
@@ -562,7 +565,10 @@ public final class MessageHelper {
             elapsed = new StopWatch(created).stop();
         }
 
-        sb.append(String.format(MESSAGE_HISTORY_OUTPUT, routeId, id, label, elapsed));
+        String goMessageHistoryOutput = exchange.getContext().getGlobalOption(Exchange.MESSAGE_HISTORY_OUTPUT_FORMAT);
+        sb.append(String.format(
+                        goMessageHistoryOutput == null ? MESSAGE_HISTORY_OUTPUT : goMessageHistoryOutput,
+                        routeId, id, label, elapsed));
         sb.append("\n");
 
         // and then each history