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 2019/12/27 09:55:54 UTC

[camel] branch master updated (44c5f45 -> ccfc9c7)

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 44c5f45  Regen
     new a604067  Fixed some logging with exceptions
     new ccfc9c7  Remove logging to apt-error log when there is no exception

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/java/org/apache/camel/impl/engine/ServicePool.java  | 9 +++++----
 .../org/apache/camel/tools/apt/ConstantProviderProcessor.java    | 1 -
 2 files changed, 5 insertions(+), 5 deletions(-)


[camel] 01/02: Fixed some logging with exceptions

Posted by da...@apache.org.
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

commit a604067fcc4cf467f4d193bca8523bc9d6b6e494
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Dec 27 09:55:59 2019 +0100

    Fixed some logging with exceptions
---
 .../src/main/java/org/apache/camel/impl/engine/ServicePool.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java
index 3efe0a7..474541a 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java
@@ -93,7 +93,7 @@ public class ServicePool<S extends Service> extends ServiceSupport implements No
             try {
                 e.getCamelContext().removeService(s);
             } catch (Exception ex) {
-                LOG.error("Error removing service {}", s, ex);
+                LOG.debug("Error removing service: " +  s, ex);
             }
         }
     }
@@ -213,7 +213,7 @@ public class ServicePool<S extends Service> extends ServiceSupport implements No
         try {
             s.stop();
         } catch (Exception e) {
-            LOG.debug("Error stopping service {}", s, e);
+            LOG.debug("Error stopping service: " +  s, e);
         }
     }
 
@@ -241,6 +241,7 @@ public class ServicePool<S extends Service> extends ServiceSupport implements No
 
         @Override
         public void release(S s) {
+            // noop
         }
 
         @Override
@@ -250,7 +251,7 @@ public class ServicePool<S extends Service> extends ServiceSupport implements No
 
         @Override
         public void stop() {
-            S toStop = null;
+            S toStop;
             synchronized (this) {
                 toStop = s;
                 s = null;
@@ -275,7 +276,7 @@ public class ServicePool<S extends Service> extends ServiceSupport implements No
                 try {
                     endpoint.getCamelContext().removeService(s);
                 } catch (Exception e) {
-                    LOG.debug("Error removing service {}", s, e);
+                    LOG.debug("Error removing service: " +  s, e);
                 }
             }
         }


[camel] 02/02: Remove logging to apt-error log when there is no exception

Posted by da...@apache.org.
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

commit ccfc9c76d9ebba82aa866b6bda0b5c1b754db845
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Dec 27 10:55:22 2019 +0100

    Remove logging to apt-error log when there is no exception
---
 .../main/java/org/apache/camel/tools/apt/ConstantProviderProcessor.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/ConstantProviderProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/ConstantProviderProcessor.java
index e6f3681..749fbb0 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/ConstantProviderProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/ConstantProviderProcessor.java
@@ -76,7 +76,6 @@ public class ConstantProviderProcessor extends AbstractCamelAnnotationProcessor
                     String name = field.getSimpleName().toString();
                     String text = (String) field.getConstantValue();
                     fields.put(name, text);
-                    dumpExceptionToErrorFile("camel-apt-error.log", "Name: " + field.getSimpleName().toString() + "=" + text, null);
                 }
             }