[karaf-decanter] branch main updated: [KARAF-7169] Rename PaxAppender LogAppender to LogCollector

[jb...@apache.org]

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

jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf-decanter.git


The following commit(s) were added to refs/heads/main by this push:
     new 127335f  [KARAF-7169] Rename PaxAppender LogAppender to LogCollector
     new a987919  Merge pull request #250 from jbonofre/KARAF-7169
127335f is described below

commit 127335fcf1dcf186bd6ea7b29a15400a4866c3b4
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Mon Sep 6 14:14:57 2021 +0200

    [KARAF-7169] Rename PaxAppender LogAppender to LogCollector
---
 .../collector/log/{LogAppender.java => LogCollector.java}  | 14 ++++++--------
 .../log/{LogAppenderTest.java => LogCollectorTest.java}    | 10 +++++-----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/collector/log/src/main/java/org/apache/karaf/decanter/collector/log/LogAppender.java b/collector/log/src/main/java/org/apache/karaf/decanter/collector/log/LogCollector.java
similarity index 94%
rename from collector/log/src/main/java/org/apache/karaf/decanter/collector/log/LogAppender.java
rename to collector/log/src/main/java/org/apache/karaf/decanter/collector/log/LogCollector.java
index 542a82e..98d64de 100644
--- a/collector/log/src/main/java/org/apache/karaf/decanter/collector/log/LogAppender.java
+++ b/collector/log/src/main/java/org/apache/karaf/decanter/collector/log/LogCollector.java
@@ -45,13 +45,13 @@ import org.slf4j.LoggerFactory;
               "name=log"},
     immediate = true
 )
-public class LogAppender implements PaxAppender {
+public class LogCollector implements PaxAppender {
 
     @Reference
     public EventAdmin dispatcher;
 
-    private static final String MDC_IN_LOG_APPENDER = "inLogAppender";
-    private final static Logger LOGGER = LoggerFactory.getLogger(LogAppender.class);
+    private static final String MDC_IN_LOG_COLLECTOR = "inLogCollector";
+    private final static Logger LOGGER = LoggerFactory.getLogger(LogCollector.class);
     private final static Pattern PATTERN = Pattern.compile("[^A-Za-z0-9]");
 
     private Dictionary<String, Object> properties;
@@ -72,16 +72,16 @@ public class LogAppender implements PaxAppender {
     
     public void doAppend(PaxLoggingEvent event) {
         try {
-            if (MDC.get(MDC_IN_LOG_APPENDER) != null) {
+            if (MDC.get(MDC_IN_LOG_COLLECTOR) != null) {
                 // Avoid recursion
                 return;
             }
-            MDC.put(MDC_IN_LOG_APPENDER, "true");
+            MDC.put(MDC_IN_LOG_COLLECTOR, "true");
             appendInternal(event);
         } catch (Exception e) {
             LOGGER.warn("Error while appending event", e);
         } finally {
-            MDC.remove(MDC_IN_LOG_APPENDER);
+            MDC.remove(MDC_IN_LOG_COLLECTOR);
         }
     }
 
@@ -91,8 +91,6 @@ public class LogAppender implements PaxAppender {
             return;
         }
 
-        LOGGER.debug("Publishing log event to the appenders ...");
-
         Map<String, Object> data = new HashMap<>();
         data.put("type", "log");
 
diff --git a/collector/log/src/test/java/org/apache/karaf/decanter/collector/log/LogAppenderTest.java b/collector/log/src/test/java/org/apache/karaf/decanter/collector/log/LogCollectorTest.java
similarity index 96%
rename from collector/log/src/test/java/org/apache/karaf/decanter/collector/log/LogAppenderTest.java
rename to collector/log/src/test/java/org/apache/karaf/decanter/collector/log/LogCollectorTest.java
index 1526445..ca109b9 100644
--- a/collector/log/src/test/java/org/apache/karaf/decanter/collector/log/LogAppenderTest.java
+++ b/collector/log/src/test/java/org/apache/karaf/decanter/collector/log/LogCollectorTest.java
@@ -34,11 +34,11 @@ import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.*;
 
-public class LogAppenderTest {
+public class LogCollectorTest {
 
     @Test
     public void testCleanLoggerName() {
-        LogAppender appender = new LogAppender();
+        LogCollector appender = new LogCollector();
         
         String loggerName = "wrong$Pattern%For&event!Name";
         String cleanedLoggerName = appender.cleanLoggerName(loggerName);
@@ -52,7 +52,7 @@ public class LogAppenderTest {
 
     @Test
     public void testIgnoredLoggerCategories() {
-        LogAppender appender = new LogAppender();
+        LogCollector appender = new LogCollector();
 
         ComponentContext componentContext = new ComponentContextMock();
         componentContext.getProperties().put("ignored.categories", "org.apache.karaf.decanter.collector.log.*,test,other");
@@ -70,7 +70,7 @@ public class LogAppenderTest {
 
     @Test
     public void testDisabledLocationCategories() {
-        LogAppender appender = new LogAppender();
+        LogCollector appender = new LogCollector();
 
         ComponentContext componentContext = new ComponentContextMock();
         componentContext.getProperties().put("location.disabled", "org.apache.karaf.decanter.collector.log.*,test,other");
@@ -88,7 +88,7 @@ public class LogAppenderTest {
 
     @Test
     public void testDisabledLocationCategoriesAllWildcard() {
-        LogAppender appender = new LogAppender();
+        LogCollector appender = new LogCollector();
 
         ComponentContext componentContext = new ComponentContextMock();
         componentContext.getProperties().put("location.disabled", ".*,test,other");