You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/06/08 17:33:16 UTC

[1/3] camel git commit: CAMEL-11384:Added the option for useMDCLogging

Repository: camel
Updated Branches:
  refs/heads/master 574091dd9 -> 39d70fd56


CAMEL-11384:Added the option for useMDCLogging


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

Branch: refs/heads/master
Commit: 1126d4af0149b3227e9843bfd2bd41dbdb225cb6
Parents: 574091d
Author: Ramu <kk...@redhat.com>
Authored: Thu Jun 8 20:21:20 2017 +0530
Committer: Ramu <kk...@redhat.com>
Committed: Thu Jun 8 20:21:20 2017 +0530

----------------------------------------------------------------------
 .../spring/boot/CamelConfigurationProperties.java      | 13 +++++++++++++
 1 file changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/1126d4af/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
index 47417f3..a9d54ca 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
@@ -404,6 +404,11 @@ public class CamelConfigurationProperties {
      * Tracer maximum characters in total
      */
     private Integer tracerFormatterMaxChars = 10000;
+    
+    /**
+     *  Adds the option for MDCLogging
+     */
+    private String useMDCLogging;
 
     // Getters & setters
 
@@ -872,4 +877,12 @@ public class CamelConfigurationProperties {
     public void setIncludeNonSingletons(boolean includeNonSingletons) {
         this.includeNonSingletons = includeNonSingletons;
     }
+    
+    public String getUseMDCLogging() {
+        return useMDCLogging;
+    }
+    
+    public void setUseMDCLogging(String useMDCLogging) {
+        this.useMDCLogging = useMDCLogging;
+    }
 }


[2/3] camel git commit: CAMEL-11384:Added the option for useMDCLogging

Posted by da...@apache.org.
CAMEL-11384:Added the option for useMDCLogging


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

Branch: refs/heads/master
Commit: 37d2502dc1c4ff8b249096d84a6240335864643e
Parents: 1126d4a
Author: Ramu <kk...@redhat.com>
Authored: Thu Jun 8 22:52:37 2017 +0530
Committer: Ramu <kk...@redhat.com>
Committed: Thu Jun 8 22:52:37 2017 +0530

----------------------------------------------------------------------
 .../org/apache/camel/spring/boot/CamelAutoConfiguration.java   | 1 +
 .../apache/camel/spring/boot/CamelConfigurationProperties.java | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/37d2502d/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
index 4da40b3..e3588df 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
@@ -157,6 +157,7 @@ public class CamelAutoConfiguration {
         camelContext.setAllowUseOriginalMessage(config.isAllowUseOriginalMessage());
         camelContext.setUseBreadcrumb(config.isUseBreadcrumb());
         camelContext.setUseDataType(config.isUseDataType());
+        camelContext.setUseMDCLogging(config.isUseMDCLogging());
 
         if (camelContext.getManagementStrategy().getManagementAgent() != null) {
             camelContext.getManagementStrategy().getManagementAgent().setEndpointRuntimeStatisticsEnabled(config.isEndpointRuntimeStatisticsEnabled());

http://git-wip-us.apache.org/repos/asf/camel/blob/37d2502d/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
index a9d54ca..a3097f3 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
@@ -408,7 +408,7 @@ public class CamelConfigurationProperties {
     /**
      *  Adds the option for MDCLogging
      */
-    private String useMDCLogging;
+    private boolean useMDCLogging;
 
     // Getters & setters
 
@@ -878,11 +878,11 @@ public class CamelConfigurationProperties {
         this.includeNonSingletons = includeNonSingletons;
     }
     
-    public String getUseMDCLogging() {
+    public boolean isUseMDCLogging() {
         return useMDCLogging;
     }
     
-    public void setUseMDCLogging(String useMDCLogging) {
+    public void setUseMDCLogging(boolean useMDCLogging) {
         this.useMDCLogging = useMDCLogging;
     }
 }


[3/3] camel git commit: Polished. This closes #1745

Posted by da...@apache.org.
Polished. This closes #1745


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

Branch: refs/heads/master
Commit: 39d70fd56dbf267e0404fdd8b65e9ea365db665a
Parents: 37d2502
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jun 8 19:33:08 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 8 19:33:08 2017 +0200

----------------------------------------------------------------------
 .../org/apache/camel/spring/boot/CamelConfigurationProperties.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/39d70fd5/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
index a3097f3..9e87e35 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
@@ -406,7 +406,7 @@ public class CamelConfigurationProperties {
     private Integer tracerFormatterMaxChars = 10000;
     
     /**
-     *  Adds the option for MDCLogging
+     * To turn on MDC logging
      */
     private boolean useMDCLogging;