You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/07/15 10:02:04 UTC

git commit: CAMEL-7599 support to configure the LoggerEndpoint without using URI

Repository: camel
Updated Branches:
  refs/heads/master 25770d635 -> 2bb29b7a8


CAMEL-7599 support to configure the LoggerEndpoint without using URI


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

Branch: refs/heads/master
Commit: 2bb29b7a8ffabcbbaf3116a423fe03b04088867c
Parents: 25770d6
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Jul 15 15:56:00 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Jul 15 16:00:35 2014 +0800

----------------------------------------------------------------------
 .../camel/component/log/LogComponent.java       | 48 +++++++---------
 .../apache/camel/component/log/LogEndpoint.java | 59 ++++++++++++++++++++
 .../camel/component/log/LogEndpointTest.java    | 23 +++++++-
 3 files changed, 99 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2bb29b7a/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java b/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
index 1e9e18b..a7cf529 100644
--- a/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
@@ -60,43 +60,33 @@ public class LogComponent extends UriEndpointComponent {
                 LOG.info("More than one {} instance found in the registry. Falling back to creating logger from URI {}.", Logger.class.getName(), uri);
             }
         }
+        
         LogEndpoint endpoint = new LogEndpoint(uri, this);
         endpoint.setLevel(level.name());
         setProperties(endpoint, parameters);
-
-        CamelLogger camelLogger = null;
+      
         if (providedLogger == null) {
-            camelLogger = new CamelLogger(remaining, level, endpoint.getMarker());
+            endpoint.setLoggerName(remaining);
         } else {
-            camelLogger = new CamelLogger(providedLogger, level, endpoint.getMarker());
+            endpoint.setProvidedLogger(providedLogger);
         }
-        Processor logger;
-        if (endpoint.getGroupSize() != null) {
-            logger = new ThroughputLogger(camelLogger, endpoint.getGroupSize());
-        } else if (endpoint.getGroupInterval() != null) {
-            Boolean groupActiveOnly = endpoint.getGroupActiveOnly() != null ? endpoint.getGroupActiveOnly() : Boolean.TRUE;
-            Long groupDelay = endpoint.getGroupDelay();
-            logger = new ThroughputLogger(camelLogger, this.getCamelContext(), endpoint.getGroupInterval(), groupDelay, groupActiveOnly);
-        } else {
-            // first, try to use the user-specified formatter (or the one picked up from the Registry and transferred to
-            // the property by a previous endpoint initialisation); if null, try to pick it up from the Registry now
-            ExchangeFormatter localFormatter = exchangeFormatter;
-            if (localFormatter == null) {
-                localFormatter = getCamelContext().getRegistry().lookupByNameAndType("logFormatter", ExchangeFormatter.class);
-                if (localFormatter != null) {
-                    exchangeFormatter = localFormatter;
-                    setProperties(exchangeFormatter, parameters);
-                }
-            }
-            // if no formatter is available in the Registry, create a local one of the default type, for a single use
-            if (localFormatter == null) {
-                localFormatter = new DefaultExchangeFormatter();
-                setProperties(localFormatter, parameters);
+       
+        // first, try to use the user-specified formatter (or the one picked up from the Registry and transferred to
+        // the property by a previous endpoint initialisation); if null, try to pick it up from the Registry now
+        ExchangeFormatter localFormatter = exchangeFormatter;
+        if (localFormatter == null) {
+            localFormatter = getCamelContext().getRegistry().lookupByNameAndType("logFormatter", ExchangeFormatter.class);
+            if (localFormatter != null) {
+                exchangeFormatter = localFormatter;
+                setProperties(exchangeFormatter, parameters);
             }
-            logger = new CamelLogProcessor(camelLogger, localFormatter);
         }
-
-        endpoint.setLogger(logger);
+        // if no formatter is available in the Registry, create a local one of the default type, for a single use
+        if (localFormatter == null) {
+            localFormatter = new DefaultExchangeFormatter();
+            setProperties(localFormatter, parameters);
+        }
+        endpoint.setLocalFormatter(localFormatter);
         return endpoint;
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bb29b7a/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java
index 96b11bf..7277642 100644
--- a/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java
@@ -17,12 +17,18 @@
 package org.apache.camel.component.log;
 
 import org.apache.camel.Component;
+import org.apache.camel.LoggingLevel;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.impl.ProcessorEndpoint;
+import org.apache.camel.processor.CamelLogProcessor;
+import org.apache.camel.processor.ThroughputLogger;
+import org.apache.camel.spi.ExchangeFormatter;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
+import org.apache.camel.util.CamelLogger;
 import org.apache.camel.util.ServiceHelper;
+import org.slf4j.Logger;
 
 /**
  * Logger endpoint.
@@ -43,6 +49,10 @@ public class LogEndpoint extends ProcessorEndpoint {
     private Boolean groupActiveOnly;
     @UriParam
     private Long groupDelay;
+    
+    private ExchangeFormatter localFormatter;
+    private Logger providedLogger;
+    private String loggerName;
 
     public LogEndpoint() {
     }
@@ -58,6 +68,31 @@ public class LogEndpoint extends ProcessorEndpoint {
 
     @Override
     protected void doStart() throws Exception {
+        if (logger == null) {
+            // setup a new logger here
+            CamelLogger camelLogger = null;
+            LoggingLevel loggingLevel = LoggingLevel.INFO;
+            if (level != null) {
+                loggingLevel = LoggingLevel.valueOf(level);
+            }
+            if (providedLogger == null) {
+                camelLogger = new CamelLogger(loggerName, loggingLevel, getMarker());
+            } else {
+                camelLogger = new CamelLogger(providedLogger, loggingLevel, getMarker());
+            }
+            if (getGroupSize() != null) {
+                logger = new ThroughputLogger(camelLogger, getGroupSize());
+            } else if (getGroupInterval() != null) {
+                Boolean groupActiveOnly = getGroupActiveOnly() != null ? getGroupActiveOnly() : Boolean.TRUE;
+                Long groupDelay = getGroupDelay();
+                logger = new ThroughputLogger(camelLogger, this.getCamelContext(), getGroupInterval(), groupDelay, groupActiveOnly);
+            } else {
+                logger = new CamelLogProcessor(camelLogger, localFormatter);
+            }
+            // the logger is the processor
+            setProcessor(this.logger);
+            
+        }
         ServiceHelper.startService(logger);
     }
 
@@ -133,4 +168,28 @@ public class LogEndpoint extends ProcessorEndpoint {
     public void setGroupDelay(Long groupDelay) {
         this.groupDelay = groupDelay;
     }
+
+    public ExchangeFormatter getLocalFormatter() {
+        return localFormatter;
+    }
+
+    public void setLocalFormatter(ExchangeFormatter localFormatter) {
+        this.localFormatter = localFormatter;
+    }
+
+    public Logger getProvidedLogger() {
+        return providedLogger;
+    }
+
+    public void setProvidedLogger(Logger providedLogger) {
+        this.providedLogger = providedLogger;
+    }
+
+    public String getLoggerName() {
+        return loggerName;
+    }
+
+    public void setLoggerName(String loggerName) {
+        this.loggerName = loggerName;
+    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/2bb29b7a/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointTest.java b/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointTest.java
index 534b261..010c13d 100644
--- a/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointTest.java
@@ -47,12 +47,23 @@ public class LogEndpointTest extends ContextTestSupport {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);
 
-        template.sendBody("direct:start", "Hello World");
+        template.sendBody("direct:start1", "Hello World");
 
         assertMockEndpointsSatisfied();
 
         assertNotNull(logged);
     }
+    
+    
+    public void testLogEndpointGroupSize() throws InterruptedException {
+        MockEndpoint out = getMockEndpoint("mock:result");
+        int expectedCount = 50;
+        out.expectedMessageCount(expectedCount);
+        for (int i = 0; i < expectedCount; i++) {
+            template.sendBody("direct:start2", "blub");
+        }
+        out.assertIsSatisfied();
+    }
 
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
@@ -62,10 +73,18 @@ public class LogEndpointTest extends ContextTestSupport {
                 LogEndpoint end = new LogEndpoint();
                 end.setCamelContext(context);
                 end.setLogger(new MyLogger());
+                
+                LogEndpoint endpoint = new LogEndpoint();
+                endpoint.setLoggerName("loggerSetter");
+                endpoint.setGroupSize(10);
+                endpoint.setCamelContext(context);
+                endpoint.start();
 
                 assertEquals("log:myLogger", end.getEndpointUri());
 
-                from("direct:start").to(end).to("mock:result");
+                from("direct:start1").to(end).to("mock:result");
+                
+                from("direct:start2").to(endpoint).to("mock:result");
             }
         };
     }